diff options
56 files changed, 380 insertions, 324 deletions
diff --git a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java index c39b212d9..6bb800673 100644 --- a/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java +++ b/org.eclipse.mylyn.bugzilla.core/src/org/eclipse/mylyn/internal/bugzilla/core/BugzillaRepositoryConnector.java @@ -41,7 +41,7 @@ import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.TaskComment; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.UnrecognizedReponseException; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; @@ -71,7 +71,7 @@ public class BugzillaRepositoryConnector extends AbstractRepositoryConnector { private BugzillaClientManager clientManager; @Override - public void init(getAllCategories taskList) { + public void init(TaskList taskList) { super.init(taskList); this.taskDataHandler = new BugzillaTaskDataHandler(this); this.attachmentHandler = new BugzillaAttachmentHandler(this); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java index 29fa51c52..a616147e6 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java @@ -27,7 +27,7 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskFactory; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; @@ -49,7 +49,7 @@ public abstract class AbstractBugzillaTest extends TestCase { protected TaskRepository repository; - protected getAllCategories taskList; + protected TaskList taskList; protected ITaskFactory taskFactory; diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java index 6b733ec2b..493557319 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java @@ -22,7 +22,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.QueryHitCollector; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskFactory; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -115,7 +115,7 @@ public class BugzillaSearchEngineTest extends TestCase { AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( BugzillaCorePlugin.REPOSITORY_KIND); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository)); connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector, false); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java index e125b48e8..e300adcac 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaTaskListManagerTest.java @@ -27,7 +27,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -79,7 +79,7 @@ public class BugzillaTaskListManagerTest extends TestCase { TasksUiPlugin.getTaskListManager().resetTaskList(); TasksUiPlugin.getTaskListManager().readExistingOrCreateNewList(); - getAllCategories taskList = manager.getTaskList(); + TaskList taskList = manager.getTaskList(); assertEquals(1, taskList.getAllTasks().size()); Set<AbstractTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl); assertNotNull(tasksReturned); @@ -167,7 +167,7 @@ public class BugzillaTaskListManagerTest extends TestCase { Collection<AbstractTask> allTasks = manager.getTaskList().getAllTasks(); Set<AbstractTask> allRootTasks = manager.getTaskList().getRootTasks(); Set<AbstractTaskContainer> allCategories = manager.getTaskList().getCategories(); - Set<AbstractTaskListElement> allRoots = manager.getTaskList().getRootElements(); + Set<AbstractTaskContainer> allRoots = manager.getTaskList().getRootElements(); assertEquals(0, allRootTasks.size()); manager.saveTaskList(); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java index 1b4d2ea19..88361b493 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskReportGeneratorTest.java @@ -24,7 +24,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; import org.eclipse.mylyn.internal.tasks.ui.planner.CompletedTaskCollector; import org.eclipse.mylyn.internal.tasks.ui.planner.TaskReportGenerator; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -115,7 +115,7 @@ public class TaskReportGeneratorTest extends TestCase { TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category"); manager.getTaskList().addCategory(cat1); - Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>(); + Set<AbstractTaskContainer> catagories = new HashSet<AbstractTaskContainer>(); catagories.add(cat1); CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0)); @@ -138,7 +138,7 @@ public class TaskReportGeneratorTest extends TestCase { TaskCategory cat1 = new TaskCategory("TaskReportGeneratorTest Category"); manager.getTaskList().addCategory(cat1); - Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>(); + Set<AbstractTaskContainer> catagories = new HashSet<AbstractTaskContainer>(); catagories.add(cat1); CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0)); @@ -164,7 +164,7 @@ public class TaskReportGeneratorTest extends TestCase { manager.getTaskList().addQuery(bugQuery); - Set<AbstractTaskListElement> catagories = new HashSet<AbstractTaskListElement>(); + Set<AbstractTaskContainer> catagories = new HashSet<AbstractTaskContainer>(); catagories.add(bugQuery); CompletedTaskCollector collector = new CompletedTaskCollector(new Date(0)); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java index 4326296db..1c136ce4c 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java @@ -25,7 +25,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskDataHandler; import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskFactory; @@ -54,7 +54,7 @@ public class BugzillaQueryTest extends TestCase { // BugzillaCorePlugin.REPOSITORY_KIND); connector = new BugzillaRepositoryConnector(); - connector.init(new getAllCategories()); + connector.init(new TaskList()); handler = connector.getTaskDataHandler(); repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL); Credentials credentials = TestUtil.readCredentials(); @@ -131,7 +131,7 @@ public class BugzillaQueryTest extends TestCase { + "/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=search-match-test&product=TestProduct&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&deadlinefrom=&deadlineto=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="; // holds onto actual hit objects - getAllCategories taskList = new getAllCategories(); + TaskList taskList = new TaskList(); QueryHitCollector collector = new QueryHitCollector(taskList, new TaskFactory(repository)); BugzillaRepositoryConnector connector = new BugzillaRepositoryConnector(); connector.init(taskList); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java index 739d02fdc..055073c46 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaTaskHistoryTest.java @@ -29,7 +29,7 @@ import org.eclipse.mylyn.internal.bugzilla.core.history.AssignmentEvent; import org.eclipse.mylyn.internal.bugzilla.core.history.ResolutionEvent; import org.eclipse.mylyn.internal.bugzilla.core.history.StatusEvent; import org.eclipse.mylyn.internal.bugzilla.core.history.TaskHistory; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; public class BugzillaTaskHistoryTest extends AbstractBugzillaTest { @@ -45,7 +45,7 @@ public class BugzillaTaskHistoryTest extends AbstractBugzillaTest { public void setUp() throws Exception { super.setUp(); connector = new BugzillaRepositoryConnector(); - connector.init(new getAllCategories()); + connector.init(new TaskList()); repository = new TaskRepository(BugzillaCorePlugin.REPOSITORY_KIND, IBugzillaConstants.TEST_BUGZILLA_222_URL); Credentials credentials = TestUtil.readCredentials(); diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/DummySearchHitProvider.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/DummySearchHitProvider.java index e7f7aa6ae..b66871ff8 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/DummySearchHitProvider.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/DummySearchHitProvider.java @@ -17,11 +17,11 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskFactory; import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; public class DummySearchHitProvider extends QueryHitCollector { - public DummySearchHitProvider(getAllCategories tasklist) { + public DummySearchHitProvider(TaskList tasklist) { super(tasklist, new ITaskFactory() { public AbstractTask createTask(RepositoryTaskData taskData, boolean synchData, diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java index 89eca12fd..ea1723684 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskExternalizer.java @@ -18,7 +18,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -58,7 +58,7 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractRepositoryQuery readQuery(Node node, getAllCategories taskList) throws TaskExternalizationException { + public AbstractRepositoryQuery readQuery(Node node, TaskList taskList) throws TaskExternalizationException { Element element = (Element) node; BugzillaRepositoryQuery query = new BugzillaRepositoryQuery(element.getAttribute(KEY_REPOSITORY_URL), element .getAttribute(KEY_QUERY_STRING), element.getAttribute(KEY_NAME)); @@ -95,7 +95,7 @@ public class BugzillaTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, + public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException { BugzillaTask task = new BugzillaTask(repositoryUrl, taskId, summary); if (element.hasAttribute(KEY_SEVERITY)) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java index 547f02d87..f2f7becbf 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/LocalTaskExternalizer.java @@ -15,7 +15,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.w3c.dom.Element; /** @@ -29,7 +29,7 @@ public class LocalTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, + public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException { // String handle; // if (element.hasAttribute(KEY_HANDLE)) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java index c075c18ca..8581bae75 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/internal/tasks/core/WebTask.java @@ -32,7 +32,6 @@ public class WebTask extends AbstractTask { public WebTask(String id, String label, String taskPrefix, String repositoryUrl, String repsitoryType) { super(repositoryUrl, id, label); this.taskPrefix = taskPrefix; - this.repositoryUrl = repositoryUrl; this.repsitoryType = repsitoryType; setTaskUrl(taskPrefix + id); } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java index f9c03bfca..8eca91e4a 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java @@ -47,13 +47,13 @@ public abstract class AbstractRepositoryConnector { protected Set<RepositoryTemplate> templates = new LinkedHashSet<RepositoryTemplate>(); - protected getAllCategories taskList; + protected TaskList taskList; private boolean userManaged = true; private TaskDataManager taskDataManager; - public void init(getAllCategories taskList) { + public void init(TaskList taskList) { this.taskList = taskList; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java index 55ae28918..07a635a65 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTask.java @@ -19,8 +19,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; /** - * Virtual proxy for a repository task. - * * @author Mik Kersten * @author Rob Elves */ @@ -28,21 +26,68 @@ public abstract class AbstractTask extends AbstractTaskListElement { @Deprecated public static final String DEFAULT_TASK_KIND = "task"; + + private String repositoryUrl; + + private String kind = DEFAULT_TASK_KIND; + + private String taskId; + + private String owner; + + private boolean active = false; + + private String summary; + + private String priority = PriorityLevel.getDefault().toString(); + + private boolean completed; + + private boolean isNotifiedIncoming = false; + + private boolean hasReminded = false; + + private String taskUrl = ""; + + + @Deprecated + private AbstractTaskContainer parentCategory = null; + + + // ************ Synch **************** /** The last time this task's bug report was in a synchronized (read?) state. */ - protected String lastSynchronizedDateStamp; + private String lastSynchronizedDateStamp; - protected String repositoryUrl; + private boolean currentlySynchronizing; - protected String taskId; + private boolean submitting; - protected String owner; - - protected boolean isNotifiedIncoming = false; + private RepositoryTaskSyncState syncState = RepositoryTaskSyncState.SYNCHRONIZED; + // transient + private IStatus errorStatus = null; + public enum RepositoryTaskSyncState { OUTGOING, SYNCHRONIZED, INCOMING, CONFLICT } + + // ************ Planning **************** + + private Date completionDate = null; + + private Date creationDate = null; + + private Date scheduledForDate = null; + + private Date dueDate = null; + + private String notes = ""; + + private int estimatedTimeHours = 1; + + + public enum PriorityLevel { P1, P2, P3, P4, P5; @@ -116,45 +161,6 @@ public abstract class AbstractTask extends AbstractTaskListElement { return P3; } } - - protected RepositoryTaskSyncState syncState = RepositoryTaskSyncState.SYNCHRONIZED; - - // transient - protected IStatus errorStatus = null; - - // transient - protected boolean currentlySynchronizing; - - // transient - protected boolean submitting; - - private boolean active = false; - - private boolean hasReminded = false; - - private String summary; - - private String priority = PriorityLevel.getDefault().toString(); - - private String notes = ""; - - private int estimatedTimeHours = 1; - - private boolean completed; - - private String taskUrl = ""; - - private AbstractTaskListElement parentCategory = null; - - private Date completionDate = null; - - private Date creationDate = null; - - private Date scheduledForDate = null; - - private Date dueDate = null; - - protected String kind = DEFAULT_TASK_KIND; public AbstractTask(String repositoryUrl, String taskId, String summary) { super(RepositoryTaskHandleUtil.getHandle(repositoryUrl, taskId)); @@ -334,12 +340,16 @@ public abstract class AbstractTask extends AbstractTaskListElement { /** * Use TaskList for moving tasks between containers + * + * TODO: get rid of this or we should make TaskCategory API. */ - public void setContainer(AbstractTaskListElement cat) { - this.parentCategory = cat; + @Deprecated + public void setCategory(AbstractTaskContainer category) { + this.parentCategory = category; } - public AbstractTaskListElement getContainer() { + @Deprecated + public AbstractTaskContainer getCategory() { return parentCategory; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListElement.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListElement.java index aa24c28ea..237e94cb3 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListElement.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractTaskListElement.java @@ -79,7 +79,7 @@ public abstract class AbstractTaskListElement extends PlatformObject implements } /** - * Use {@link getAllCategories} methods instead. + * Use {@link TaskList} methods instead. */ void add(AbstractTask task) { children.add(task); @@ -104,6 +104,7 @@ public abstract class AbstractTaskListElement extends PlatformObject implements return handle.hashCode(); } + @Deprecated public void setUrl(String url) { this.url = url; } @@ -132,6 +133,7 @@ public abstract class AbstractTaskListElement extends PlatformObject implements /** * Override for custom-named elements. */ + @Deprecated public boolean canRename() { return true; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AutomaticCategory.java index dce7c2438..c0dc75b63 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/UncategorizedCategory.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AutomaticCategory.java @@ -14,15 +14,17 @@ package org.eclipse.mylyn.tasks.core; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; /** + * Category created for the user to hold uncategorized tasks. + * * @author Rob Elves */ -public class UncategorizedCategory extends AbstractTaskContainer { +public class AutomaticCategory extends TaskCategory { - public static final String LABEL = "<Uncategorized>";// "Root + public static final String LABEL = "<Uncategorized>"; public static final String HANDLE = "uncategorized"; - public UncategorizedCategory() { + public AutomaticCategory() { super(HANDLE); } @@ -44,9 +46,4 @@ public class UncategorizedCategory extends AbstractTaskContainer { public boolean canRename() { return false; } - - @Override - public final boolean isLocal() { - return true; - } } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java index c60e022ea..95cab26ac 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DateRangeActivityDelegate.java @@ -106,8 +106,8 @@ public class DateRangeActivityDelegate extends AbstractTask { // task.addSubTask(task); // } - public AbstractTaskListElement getContainer() { - return task.getContainer(); + public AbstractTaskContainer getCategory() { + return task.getCategory(); } public Set<AbstractTask> getChildren() { @@ -178,8 +178,8 @@ public class DateRangeActivityDelegate extends AbstractTask { task.setActive(active); } - public void setContainer(AbstractTaskListElement category) { - task.setContainer(category); + public void setCategory(AbstractTaskContainer category) { + task.setCategory(category); } public void setCompleted(boolean completed) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java index 82736d874..7b8fc11f1 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/DelegatingTaskExternalizer.java @@ -141,7 +141,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { public Element createCategoryElement(AbstractTaskListElement category, Document doc, Element parent) { if (category instanceof TaskArchive) { return parent; - } else if (category instanceof UncategorizedCategory) { + } else if (category instanceof AutomaticCategory) { return parent; } else { Element node = doc.createElement(getCategoryTagName()); @@ -163,11 +163,11 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { node.setAttribute(KEY_LABEL, stripControlCharacters(task.getSummary())); node.setAttribute(KEY_HANDLE, task.getHandleIdentifier()); - if (task.getContainer() != null) { - if (task.getContainer().getHandleIdentifier().equals(UncategorizedCategory.HANDLE)) { + if (task.getCategory() != null) { + if (task.getCategory().getHandleIdentifier().equals(AutomaticCategory.HANDLE)) { node.setAttribute(KEY_CATEGORY, VAL_ROOT); } else { - node.setAttribute(KEY_CATEGORY, task.getContainer().getHandleIdentifier()); + node.setAttribute(KEY_CATEGORY, task.getCategory().getHandleIdentifier()); } } else { // TODO: if/when subtasks are supported this should be handled @@ -238,7 +238,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { return node; } - public void readSubTasks(AbstractTask task, NodeList nodes, getAllCategories tasklist) { + public void readSubTasks(AbstractTask task, NodeList nodes, TaskList tasklist) { for (int j = 0; j < nodes.getLength(); j++) { Node child = nodes.item(j); Element element = (Element) child; @@ -283,7 +283,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { return node.getNodeName().equals(getCategoryTagName()); } - public void readCategory(Node node, getAllCategories taskList) throws TaskExternalizationException { + public void readCategory(Node node, TaskList taskList) throws TaskExternalizationException { boolean hasCaughtException = false; Element element = (Element) node; @@ -327,7 +327,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { * First tries to use a delegate externalizer to read, if none available, * reads itself. */ - public final AbstractTask readTask(Node node, getAllCategories taskList, AbstractTaskListElement category, AbstractTask parent) + public final AbstractTask readTask(Node node, TaskList taskList, AbstractTaskContainer category, AbstractTask parent) throws TaskExternalizationException { AbstractTask task = null; String taskId = null; @@ -372,7 +372,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { /** * Override for connector-specific implementation */ - public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, + public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException { String handle; if (element.hasAttribute(KEY_HANDLE)) { @@ -384,13 +384,13 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { return task; } - private void readTaskInfo(AbstractTask task, getAllCategories taskList, Element element, AbstractTask parent, - AbstractTaskListElement legacyCategory) throws TaskExternalizationException { + private void readTaskInfo(AbstractTask task, TaskList taskList, Element element, AbstractTask parent, + AbstractTaskContainer legacyCategory) throws TaskExternalizationException { String categoryHandle = null; if (element.hasAttribute(KEY_CATEGORY)) { categoryHandle = element.getAttribute(KEY_CATEGORY); - AbstractTaskListElement category = null; + AbstractTaskContainer category = null; if (categoryHandle != null) { category = taskList.getContainerForHandle(categoryHandle); } @@ -401,7 +401,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { taskList.internalAddRootTask(task); } } else if (legacyCategory != null && !(legacyCategory instanceof TaskArchive)) { - task.setContainer(legacyCategory); + task.setCategory(legacyCategory); legacyCategory.add(task); } else if (legacyCategory == null && parent == null) { if (task instanceof AbstractTask) { @@ -620,7 +620,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { * This happens on startup, so connectors should not perform any network * operations when reading queries. */ - public AbstractRepositoryQuery readQuery(Node node, getAllCategories tlist) throws TaskExternalizationException { + public AbstractRepositoryQuery readQuery(Node node, TaskList tlist) throws TaskExternalizationException { // doesn't know how to read any queries return null; } @@ -644,7 +644,7 @@ public class DelegatingTaskExternalizer implements ITaskListExternalizer { return false; } - public final void readQueryHit(Element element, getAllCategories taskList, AbstractRepositoryQuery query) + public final void readQueryHit(Element element, TaskList taskList, AbstractRepositoryQuery query) throws TaskExternalizationException { if (element.hasAttribute(KEY_HANDLE)) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java index 074295ed4..73f917f3e 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/ITaskListExternalizer.java @@ -46,12 +46,12 @@ public interface ITaskListExternalizer { public abstract boolean canReadCategory(Node node); - public abstract void readCategory(Node node, getAllCategories taskList) throws TaskExternalizationException; + public abstract void readCategory(Node node, TaskList taskList) throws TaskExternalizationException; public abstract boolean canReadTask(Node node); public abstract AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, - getAllCategories tlist, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException; + TaskList tlist, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException; public abstract boolean canCreateElementFor(AbstractRepositoryQuery category); @@ -59,5 +59,5 @@ public interface ITaskListExternalizer { public abstract boolean canReadQuery(Node node); - public abstract AbstractRepositoryQuery readQuery(Node node, getAllCategories tlist) throws TaskExternalizationException; + public abstract AbstractRepositoryQuery readQuery(Node node, TaskList tlist) throws TaskExternalizationException; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java index 41ac7ed98..b68a980b8 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/QueryHitCollector.java @@ -51,11 +51,11 @@ public class QueryHitCollector { /** The string to display to the user when the query is done */ private static final String DONE = "done"; - protected getAllCategories taskList; + protected TaskList taskList; protected ITaskFactory taskFactory; - public QueryHitCollector(getAllCategories tasklist, ITaskFactory taskFactory) { + public QueryHitCollector(TaskList tasklist, ITaskFactory taskFactory) { this.taskList = tasklist; this.taskFactory = taskFactory; } diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/getAllCategories.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java index 9d107fab0..24b128b6d 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/getAllCategories.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java @@ -31,11 +31,7 @@ import org.eclipse.mylyn.internal.tasks.core.RepositoryTaskHandleUtil; * * @author Mik Kersten */ -public class getAllCategories { - - // public static final String LABEL_ROOT = "Uncategorized";// "Root - - // (automatic)"; +public class TaskList { private int lastTaskNum = 0; @@ -49,11 +45,11 @@ public class getAllCategories { private TaskArchive archiveContainer; - private UncategorizedCategory uncategorizedCategory; + private AutomaticCategory automaticCategory; private List<AbstractTask> activeTasks; - public getAllCategories() { + public TaskList() { reset(); } @@ -67,11 +63,11 @@ public class getAllCategories { queries = new ConcurrentHashMap<String, AbstractRepositoryQuery>(); archiveContainer = new TaskArchive(); - uncategorizedCategory = new UncategorizedCategory(); + automaticCategory = new AutomaticCategory(); activeTasks = new CopyOnWriteArrayList<AbstractTask>(); lastTaskNum = 0; - categories.put(uncategorizedCategory.getHandleIdentifier(), uncategorizedCategory); + categories.put(automaticCategory.getHandleIdentifier(), automaticCategory); categories.put(archiveContainer.getHandleIdentifier(), archiveContainer); } @@ -102,7 +98,7 @@ public class getAllCategories { * @param task to be added (hit, subtask, etc) * @param container task container, query or parent task */ - public void addTask(AbstractTask task, AbstractTaskListElement container) { + public void addTask(AbstractTask task, AbstractTaskListElement parentElement) { AbstractTask newTask = tasks.get(task.getHandleIdentifier()); @@ -110,20 +106,20 @@ public class getAllCategories { newTask = task; tasks.put(newTask.getHandleIdentifier(), newTask); archiveContainer.add(newTask); - newTask.setContainer(archiveContainer); + newTask.setCategory(archiveContainer); for (ITaskListChangeListener listener : changeListeners) { listener.taskAdded(newTask); } } - if (container != null) { - container.add(newTask); - if (!(container instanceof AbstractTask) && !(container instanceof AbstractRepositoryQuery)) { - newTask.setContainer(container); + if (parentElement != null) { + parentElement.add(newTask); + if (parentElement instanceof TaskCategory) { + newTask.setCategory((TaskCategory)parentElement); } } else { - uncategorizedCategory.add(newTask); - newTask.setContainer(uncategorizedCategory); + automaticCategory.add(newTask); + newTask.setCategory(automaticCategory); } } @@ -157,16 +153,16 @@ public class getAllCategories { } public void moveToRoot(AbstractTask task) { - moveToContainer(uncategorizedCategory, task); + moveToContainer(automaticCategory, task); } - public void moveToContainer(AbstractTaskListElement toContainer, AbstractTask task) { + public void moveToContainer(AbstractTaskContainer toContainer, AbstractTask task) { if (!tasks.containsKey(task.getHandleIdentifier())) { tasks.put(task.getHandleIdentifier(), task); } - AbstractTaskListElement fromContainer = task.getContainer(); - if (fromContainer instanceof AbstractTaskListElement) { + AbstractTaskContainer fromContainer = task.getCategory(); + if (fromContainer instanceof AbstractTaskContainer) { (fromContainer).remove(task); } if (toContainer != null) { @@ -202,7 +198,7 @@ public class getAllCategories { } public void renameContainer(AbstractTaskContainer container, String newDescription) { - if (!(container instanceof TaskArchive) && !(container instanceof UncategorizedCategory)) { + if (!(container instanceof TaskArchive) && !(container instanceof AutomaticCategory)) { if (queries.remove(container.getHandleIdentifier()) != null) { container.setDescription(newDescription); if (container instanceof AbstractRepositoryQuery) { @@ -233,10 +229,10 @@ public class getAllCategories { */ public void deleteTask(AbstractTask task) { archiveContainer.remove(task); - uncategorizedCategory.remove(task); - if (task.getContainer() != null) { - task.getContainer().remove(task); - task.setContainer(null); + automaticCategory.remove(task); + if (task.getCategory() != null) { + task.getCategory().remove(task); + task.setCategory(null); } tasks.remove(task.getHandleIdentifier()); for (ITaskListChangeListener listener : changeListeners) { @@ -244,9 +240,9 @@ public class getAllCategories { } } - public void deleteCategory(AbstractTaskListElement category) { + public void deleteCategory(AbstractTaskContainer category) { for (AbstractTask task : category.getChildren()) { - uncategorizedCategory.add(task); + automaticCategory.add(task); } categories.remove(category.getHandleIdentifier()); for (ITaskListChangeListener listener : changeListeners) { @@ -283,19 +279,21 @@ public class getAllCategories { categories.put(category.getHandleIdentifier(), category); } - public void internalAddTask(AbstractTask task, AbstractTaskListElement container) { + public void internalAddTask(AbstractTask task, AbstractTaskContainer container) { tasks.put(task.getHandleIdentifier(), task); if (container != null) { - task.setContainer(container); container.add(task); + if (container instanceof TaskCategory) { + task.setCategory((AbstractTaskContainer)container); + } } else { - task.setContainer(uncategorizedCategory); - uncategorizedCategory.add(task); + task.setCategory(automaticCategory); + automaticCategory.add(task); } } public void internalAddRootTask(AbstractTask task) { - internalAddTask(task, uncategorizedCategory); + internalAddTask(task, automaticCategory); } public void internalAddQuery(AbstractRepositoryQuery query) { @@ -342,16 +340,16 @@ public class getAllCategories { } public Set<AbstractTask> getRootTasks() { - return Collections.unmodifiableSet(uncategorizedCategory.getChildren()); + return Collections.unmodifiableSet(automaticCategory.getChildren()); } public Set<AbstractTaskContainer> getCategories() { return Collections.unmodifiableSet(new HashSet<AbstractTaskContainer>(categories.values())); } - public List<AbstractTaskListElement> getUserCategories() { - List<AbstractTaskListElement> included = new ArrayList<AbstractTaskListElement>(); - for (AbstractTaskListElement category : categories.values()) { + public List<AbstractTaskContainer> getUserCategories() { + List<AbstractTaskContainer> included = new ArrayList<AbstractTaskContainer>(); + for (AbstractTaskContainer category : categories.values()) { if (!(category instanceof TaskArchive)) { included.add(category); } @@ -364,10 +362,10 @@ public class getAllCategories { return Collections.unmodifiableSet(new HashSet<AbstractRepositoryQuery>(queries.values())); } - public Set<AbstractTaskListElement> getRootElements() { - Set<AbstractTaskListElement> roots = new HashSet<AbstractTaskListElement>(); - roots.add(uncategorizedCategory); - for (AbstractTaskListElement cat : categories.values()) + public Set<AbstractTaskContainer> getRootElements() { + Set<AbstractTaskContainer> roots = new HashSet<AbstractTaskContainer>(); + roots.add(automaticCategory); + for (AbstractTaskContainer cat : categories.values()) roots.add(cat); for (AbstractRepositoryQuery query : queries.values()) roots.add(query); @@ -378,11 +376,10 @@ public class getAllCategories { return Collections.unmodifiableCollection(tasks.values()); } - public Set<AbstractTaskListElement> getTaskContainers() { - Set<AbstractTaskListElement> containers = new HashSet<AbstractTaskListElement>(); - for (AbstractTaskListElement container : categories.values()) { - if (container instanceof TaskCategory || container instanceof TaskArchive - || container instanceof UncategorizedCategory) { + public Set<AbstractTaskContainer> getTaskContainers() { + Set<AbstractTaskContainer> containers = new HashSet<AbstractTaskContainer>(); + for (AbstractTaskContainer container : categories.values()) { + if (container instanceof TaskCategory || container instanceof TaskArchive) { containers.add(container); } } @@ -452,9 +449,9 @@ public class getAllCategories { return null; } - public AbstractTaskListElement getContainerForHandle(String categoryHandle) { - for (AbstractTaskListElement cat : categories.values()) { - if (cat instanceof AbstractTaskListElement) { + public AbstractTaskContainer getContainerForHandle(String categoryHandle) { + for (AbstractTaskContainer cat : categories.values()) { + if (cat instanceof AbstractTaskContainer) { if (cat.getHandleIdentifier().equals(categoryHandle)) { return cat; } @@ -463,8 +460,8 @@ public class getAllCategories { return null; } - public AbstractTaskListElement getUncategorizedCategory() { - return uncategorizedCategory; + public AbstractTaskContainer getAutomaticCategory() { + return automaticCategory; } public TaskArchive getArchiveContainer() { @@ -583,7 +580,7 @@ public class getAllCategories { } } - public void notifyContainerUpdated(AbstractTaskListElement container) { + public void notifyContainerUpdated(AbstractTaskContainer container) { for (ITaskListChangeListener listener : new ArrayList<ITaskListChangeListener>(changeListeners)) { try { listener.containerInfoChanged(container); @@ -610,7 +607,7 @@ public class getAllCategories { public int findLargestTaskHandle() { int max = 0; max = Math.max(largestTaskHandleHelper(tasks.values()), max); - for (AbstractTaskListElement cat : getTaskContainers()) { + for (AbstractTaskContainer cat : getTaskContainers()) { max = Math.max(largestTaskHandleHelper(cat.getChildren()), max); } return max; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java index 9b31cf428..d2c5f4a10 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java @@ -51,9 +51,9 @@ public class TaskRepositoryManager { private TaskRepositoriesExternalizer externalizer = new TaskRepositoriesExternalizer(); - private getAllCategories taskList; + private TaskList taskList; - public TaskRepositoryManager(getAllCategories taskList) { + public TaskRepositoryManager(TaskList taskList) { this.taskList = taskList; } @@ -190,7 +190,7 @@ public class TaskRepositoryManager { return repositories; } - public TaskRepository getRepositoryForActiveTask(String repositoryKind, getAllCategories taskList) { + public TaskRepository getRepositoryForActiveTask(String repositoryKind, TaskList taskList) { List<AbstractTask> activeTasks = taskList.getActiveTasks(); if (activeTasks.size() == 1) { AbstractTask activeTask = activeTasks.get(0); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java index dbf79bd51..cd2de2857 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataImportTest.java @@ -21,7 +21,7 @@ import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizard; import org.eclipse.mylyn.internal.tasks.ui.wizards.TaskDataImportWizardPage; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.widgets.Shell; @@ -81,7 +81,7 @@ public class TaskDataImportTest extends AbstractContextTest { * Tests the wizard when it has been asked to import all task data from a zip file */ public void testImportRepositoriesZip() { - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); InteractionContext historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext(); assertNotNull(taskList); assertNotNull(historyContext); @@ -104,7 +104,7 @@ public class TaskDataImportTest extends AbstractContextTest { } public void testImportOverwritesAllTasks() { - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); InteractionContext historyContext = ContextCorePlugin.getContextManager().getActivityMetaContext(); assertNotNull(taskList); assertNotNull(historyContext); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java index 2a5c94721..6cb4b7e6b 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListContentProviderTest.java @@ -15,7 +15,7 @@ import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListContentProvider; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; /** @@ -27,7 +27,7 @@ public class TaskListContentProviderTest extends TestCase { private TaskListView view; - private getAllCategories taskList; + private TaskList taskList; @Override protected void setUp() throws Exception { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java index 9821b6491..f79bd1298 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java @@ -35,14 +35,13 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskReadAction; import org.eclipse.mylyn.internal.tasks.ui.actions.MarkTaskUnreadAction; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.AutomaticCategory; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; -import org.eclipse.mylyn.tasks.core.UncategorizedCategory; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.mylyn.tasks.tests.connector.MockAttributeFactory; import org.eclipse.mylyn.tasks.tests.connector.MockRepositoryConnector; @@ -302,19 +301,19 @@ public class TaskListManagerTest extends TestCase { AbstractTask task1 = new LocalTask("t1", "t1"); manager.getTaskList().moveToRoot(task1); assertEquals(1, manager.getTaskList().getRootTasks().size()); - assertEquals(UncategorizedCategory.HANDLE, task1.getContainer().getHandleIdentifier()); + assertEquals(AutomaticCategory.HANDLE, task1.getCategory().getHandleIdentifier()); TaskCategory cat1 = new TaskCategory("c1"); manager.getTaskList().addCategory(cat1); manager.getTaskList().moveToContainer(cat1, task1); assertEquals(0, manager.getTaskList().getRootTasks().size()); - assertEquals(cat1, task1.getContainer()); + assertEquals(cat1, task1.getCategory()); manager.getTaskList().moveToRoot(task1); assertEquals(1, manager.getTaskList().getRootTasks().size()); assertEquals(0, cat1.getChildren().size()); - assertEquals(UncategorizedCategory.HANDLE, task1.getContainer().getHandleIdentifier()); + assertEquals(AutomaticCategory.HANDLE, task1.getCategory().getHandleIdentifier()); } public void testEmpty() { @@ -354,9 +353,9 @@ public class TaskListManagerTest extends TestCase { TaskCategory category = new TaskCategory("cat"); manager.getTaskList().addTask(task, category); manager.getTaskList().addCategory(category); - assertEquals(0, manager.getTaskList().getUncategorizedCategory().getChildren().size()); + assertEquals(0, manager.getTaskList().getAutomaticCategory().getChildren().size()); manager.getTaskList().deleteCategory(category); - assertEquals(1, manager.getTaskList().getUncategorizedCategory().getChildren().size()); + assertEquals(1, manager.getTaskList().getAutomaticCategory().getChildren().size()); } public void testRenameCategory() { @@ -368,7 +367,7 @@ public class TaskListManagerTest extends TestCase { assertEquals(3, manager.getTaskList().getCategories().size()); String newDesc = "newDescription"; manager.getTaskList().renameContainer(category, newDesc); - AbstractTaskListElement container = manager.getTaskList().getContainerForHandle(newDesc); + AbstractTaskContainer container = manager.getTaskList().getContainerForHandle(newDesc); assertNotNull(container); assertEquals(newDesc, container.getSummary()); manager.getTaskList().deleteCategory(container); @@ -442,7 +441,7 @@ public class TaskListManagerTest extends TestCase { TasksUiPlugin.getRepositoryManager().addRepository(repository, TasksUiPlugin.getDefault().getRepositoriesFilePath()); MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, "1"); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); taskList.moveToRoot(task); MockRepositoryQuery query = new MockRepositoryQuery("query"); taskList.addQuery(query); @@ -474,7 +473,7 @@ public class TaskListManagerTest extends TestCase { MockRepositoryTask reportInCat1 = new MockRepositoryTask("123"); manager.getTaskList().moveToContainer(cat1, reportInCat1); - assertEquals(cat1, reportInCat1.getContainer()); + assertEquals(cat1, reportInCat1.getCategory()); manager.saveTaskList(); assertNotNull(manager.getTaskList()); @@ -484,9 +483,9 @@ public class TaskListManagerTest extends TestCase { manager.readExistingOrCreateNewList(); // read once - Set<AbstractTaskListElement> readCats = manager.getTaskList().getTaskContainers(); + Set<AbstractTaskContainer> readCats = manager.getTaskList().getTaskContainers(); assertTrue(manager.getTaskList().getCategories().contains(cat1)); - Iterator<AbstractTaskListElement> iterator = readCats.iterator(); + Iterator<AbstractTaskContainer> iterator = readCats.iterator(); AbstractTaskListElement readCat1 = iterator.next(); assertEquals(cat1, readCat1); assertEquals(1, readCat1.getChildren().size()); @@ -530,7 +529,7 @@ public class TaskListManagerTest extends TestCase { AbstractTask task3 =manager.createNewLocalTask("task 3"); manager.getTaskList().moveToContainer(cat1, task3); cat1Contents.add(task3); - assertEquals(cat1, task3.getContainer()); + assertEquals(cat1, task3.getCategory()); AbstractTask sub2 = manager.createNewLocalTask("sub 2"); manager.getTaskList().addTask(sub2, task3); manager.getTaskList().moveToContainer(manager.getTaskList().getArchiveContainer(), sub2); @@ -541,7 +540,7 @@ public class TaskListManagerTest extends TestCase { MockRepositoryTask reportInCat1 = new MockRepositoryTask("123"); manager.getTaskList().moveToContainer(cat1, reportInCat1); - assertEquals(cat1, reportInCat1.getContainer()); + assertEquals(cat1, reportInCat1.getCategory()); cat1Contents.add(reportInCat1); MockRepositoryTask reportInRoot = new MockRepositoryTask("124"); @@ -572,9 +571,9 @@ public class TaskListManagerTest extends TestCase { } } - Set<AbstractTaskListElement> readCats = manager.getTaskList().getTaskContainers(); + Set<AbstractTaskContainer> readCats = manager.getTaskList().getTaskContainers(); assertTrue(manager.getTaskList().getCategories().contains(cat1)); - Iterator<AbstractTaskListElement> iterator = readCats.iterator(); + Iterator<AbstractTaskContainer> iterator = readCats.iterator(); AbstractTaskListElement readCat1 = iterator.next(); assertEquals(cat1, readCat1); assertEquals(cat1Contents, readCat1.getChildren()); @@ -617,7 +616,7 @@ public class TaskListManagerTest extends TestCase { } public void testgetQueriesAndHitsForHandle() { - getAllCategories taskList = manager.getTaskList(); + TaskList taskList = manager.getTaskList(); MockRepositoryTask hit1 = new MockRepositoryTask("1"); MockRepositoryTask hit2 = new MockRepositoryTask("2"); @@ -678,7 +677,7 @@ public class TaskListManagerTest extends TestCase { // } public void testUpdateQueryHits() { - getAllCategories taskList = manager.getTaskList(); + TaskList taskList = manager.getTaskList(); MockRepositoryTask hit1 = new MockRepositoryTask("1"); MockRepositoryTask hit2 = new MockRepositoryTask("2"); @@ -735,7 +734,7 @@ public class TaskListManagerTest extends TestCase { MockRepositoryTask task2 = new MockRepositoryTask("https://unresolved", bugNumber); manager.getTaskList().addTask(task2); - getAllCategories taskList = manager.getTaskList(); + TaskList taskList = manager.getTaskList(); assertEquals(2, taskList.getAllTasks().size()); Set<AbstractTask> tasksReturned = taskList.getRepositoryTasks(repositoryUrl); assertNotNull(tasksReturned); @@ -746,7 +745,7 @@ public class TaskListManagerTest extends TestCase { public void testAllTasksDeactivation() { AbstractTask task1 = new LocalTask("task1", "description1"); AbstractTask task2 = new LocalTask("task2", "description2"); - getAllCategories taskList = manager.getTaskList(); + TaskList taskList = manager.getTaskList(); taskList.addTask(task1); taskList.addTask(task2); assertTrue(taskList.getActiveTasks().isEmpty()); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java index d3acd6fd4..8eca69ff1 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListTest.java @@ -11,7 +11,7 @@ package org.eclipse.mylyn.tasks.tests; import junit.framework.TestCase; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; /** @@ -20,7 +20,7 @@ import org.eclipse.mylyn.tasks.core.getAllCategories; public class TaskListTest extends TestCase { public void testGetUserCategories() { - getAllCategories taskList = new getAllCategories(); + TaskList taskList = new TaskList(); taskList.addCategory(new TaskCategory("a")); assertEquals(2, taskList.getUserCategories().size()); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java index 1a16cfe1f..3a7d5a20f 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListUiTest.java @@ -103,24 +103,24 @@ public class TaskListUiTest extends TestCase { cat1task2 = manager.createNewLocalTask("task 2"); cat1task2.setPriority(PriorityLevel.P2.toString()); - cat1task2.setContainer(cat1); + cat1task2.setCategory(cat1); manager.getTaskList().moveToContainer(cat1, cat1task2); cat1task3 = manager.createNewLocalTask("task 3"); cat1task3.setPriority(PriorityLevel.P3.toString()); cat1task3.setCompleted(true); - cat1task3.setContainer(cat1); + cat1task3.setCategory(cat1); manager.getTaskList().moveToContainer(cat1, cat1task3); cat1task4 = manager.createNewLocalTask("task 4"); cat1task4.setPriority(PriorityLevel.P4.toString()); - cat1task4.setContainer(cat1); + cat1task4.setCategory(cat1); manager.getTaskList().moveToContainer(cat1, cat1task4); cat1task5 = manager.createNewLocalTask("task 5"); cat1task5.setPriority(PriorityLevel.P5.toString()); cat1task5.setCompleted(true); - cat1task5.setContainer(cat1); + cat1task5.setCategory(cat1); manager.getTaskList().moveToContainer(cat1, cat1task5); manager.getTaskList().addCategory(cat1); @@ -130,7 +130,7 @@ public class TaskListUiTest extends TestCase { cat2task1 = manager.createNewLocalTask("task 1"); cat2task1.setPriority(PriorityLevel.P1.toString()); - cat2task1.setContainer(cat2); + cat2task1.setCategory(cat2); manager.getTaskList().moveToContainer(cat2, cat2task1); cat2task1sub1 = manager.createNewLocalTask("sub task 1"); @@ -140,23 +140,23 @@ public class TaskListUiTest extends TestCase { cat2task2 = manager.createNewLocalTask("task 2"); cat2task2.setPriority(PriorityLevel.P2.toString()); cat2task2.setCompleted(true); - cat2task2.setContainer(cat2); + cat2task2.setCategory(cat2); manager.getTaskList().moveToContainer(cat2, cat2task2); cat2task3 = manager.createNewLocalTask("task 3"); cat2task3.setPriority(PriorityLevel.P3.toString()); - cat2task3.setContainer(cat2); + cat2task3.setCategory(cat2); manager.getTaskList().moveToContainer(cat2, cat2task3); cat2task4 = manager.createNewLocalTask("task 4"); cat2task4.setPriority(PriorityLevel.P4.toString()); cat2task4.setCompleted(true); - cat2task4.setContainer(cat2); + cat2task4.setCategory(cat2); manager.getTaskList().moveToContainer(cat2, cat2task4); cat2task5 = manager.createNewLocalTask("task 5"); cat2task5.setPriority(PriorityLevel.P5.toString()); - cat2task5.setContainer(cat2); + cat2task5.setCategory(cat2); manager.getTaskList().moveToContainer(cat2, cat2task5); manager.getTaskList().addCategory(cat2); @@ -176,7 +176,7 @@ public class TaskListUiTest extends TestCase { assertNotNull(view); WebTask webTask = new WebTask("1", "1", "", "", "web"); TasksUiPlugin.getTaskListManager().getTaskList().addTask(webTask, - TasksUiPlugin.getTaskListManager().getTaskList().getUncategorizedCategory()); + TasksUiPlugin.getTaskListManager().getTaskList().getAutomaticCategory()); view.getViewer().refresh(); // Arrays.asList(view.getViewer().getVisibleExpandedElements()); assertFalse(webTask.isCompleted()); diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java index 8c77c2eb7..9b3ecaaf7 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryExternalizer.java @@ -16,7 +16,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -63,7 +63,7 @@ public class MockRepositoryExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, AbstractTaskListElement category, AbstractTask parent) + public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException { MockRepositoryTask task = new MockRepositoryTask(repositoryUrl, taskId, summary); return task; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java index c3d417e68..8c1911a61 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java @@ -13,8 +13,9 @@ import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; +import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskCategory; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -44,13 +45,14 @@ public class AddExistingTaskJob extends Job { * null, it will be added to the current selected task's category in task * list */ - private AbstractTaskListElement taskContainer; + private AbstractTaskContainer taskContainer; public AddExistingTaskJob(TaskRepository repository, String taskId) { this(repository, taskId, null); } - public AddExistingTaskJob(TaskRepository repository, String taskId, AbstractTaskListElement taskContainer) { + @Deprecated // Use TaskCategory instead + public AddExistingTaskJob(TaskRepository repository, String taskId, AbstractTaskContainer taskContainer) { super(MessageFormat.format("Adding task: \"{0}\"...", taskId)); this.repository = repository; this.taskId = taskId; @@ -76,7 +78,7 @@ public class AddExistingTaskJob extends Job { PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() { public void run() { - AbstractTaskListElement category = taskContainer; + AbstractTaskContainer category = taskContainer; TaskListView taskListView = TaskListView.getFromActivePerspective(); if (category == null) { Object selectedObject = ((IStructuredSelection) taskListView.getViewer().getSelection()) @@ -84,7 +86,7 @@ public class AddExistingTaskJob extends Job { if (selectedObject instanceof TaskCategory) { category = (TaskCategory) selectedObject; } else { - category = TasksUiPlugin.getTaskListManager().getTaskList().getUncategorizedCategory(); + category = TasksUiPlugin.getTaskListManager().getTaskList().getAutomaticCategory(); } } TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(category, newTask); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java index dc92f8567..b5ebde2da 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/MoveToCategoryMenuContributor.java @@ -40,7 +40,7 @@ public class MoveToCategoryMenuContributor implements IDynamicSubMenuContributor List<AbstractTaskContainer> categories = new ArrayList<AbstractTaskContainer>(TasksUiPlugin.getTaskListManager().getTaskList().getCategories()); Collections.sort(categories); - for (final AbstractTaskListElement category : categories) { + for (final AbstractTaskContainer category : categories) { if (!category.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) { Action action = new Action() { @Override @@ -98,7 +98,7 @@ public class MoveToCategoryMenuContributor implements IDynamicSubMenuContributor * @param selectedElements * @param category */ - private void moveToCategory(final List<AbstractTaskListElement> selectedElements, AbstractTaskListElement category) { + private void moveToCategory(final List<AbstractTaskListElement> selectedElements, AbstractTaskContainer category) { for (AbstractTaskListElement element : selectedElements) { if (element instanceof AbstractTask) { TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(category, diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java index 0df89da25..1cae5a004 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/ScheduledTaskListSynchJob.java @@ -26,7 +26,7 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.core.runtime.jobs.JobChangeAdapter; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -44,7 +44,7 @@ public class ScheduledTaskListSynchJob extends Job { private long scheduleDelay = 1000 * 60 * 20;// 20 minutes default - private getAllCategories taskList = null; + private TaskList taskList = null; private static long count = 0; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java index 8a8b9a484..3e56a97c0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskWorkingSetFilter.java @@ -15,7 +15,7 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.DateRangeContainer; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IWorkingSet; @@ -26,7 +26,7 @@ import org.eclipse.ui.IWorkingSet; */ public class TaskWorkingSetFilter extends AbstractTaskListFilter { - private final getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + private final TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); private IWorkingSet currentWorkingSet; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java index ff5b3a85f..c276ec95e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/actions/TaskSelectionDialog.java @@ -32,7 +32,7 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; @@ -156,7 +156,7 @@ public class TaskSelectionDialog extends SelectionStatusDialog { // Compute all existing tasks or query hits (if corresponding task does // not exist yet...) Set<AbstractTaskListElement> allTasks = new HashSet<AbstractTaskListElement>(); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); allTasks.addAll(taskList.getAllTasks()); for (AbstractRepositoryQuery query : taskList.getQueries()) { allTasks.addAll(query.getChildren()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java index 5f20bbeed..e3af3b843 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/commands/RemoteTaskSelectionDialog.java @@ -40,9 +40,9 @@ import org.eclipse.mylyn.internal.tasks.ui.views.TaskRepositoryLabelProvider; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.TaskRepositoryFilter; import org.eclipse.mylyn.tasks.core.TaskRepositoryManager; @@ -222,10 +222,10 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { categoryViewer = new ComboViewer(addToTaskListComposite, SWT.DROP_DOWN | SWT.READ_ONLY); categoryViewer.setContentProvider(new ArrayContentProvider()); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); LinkedList<AbstractTaskListElement> categories = new LinkedList<AbstractTaskListElement>(taskList .getUserCategories()); - categories.addFirst(taskList.getUncategorizedCategory()); + categories.addFirst(taskList.getAutomaticCategory()); categoryViewer.setInput(categories); categoryViewer.setLabelProvider(new LabelProvider() { @@ -238,7 +238,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { } }); - categoryViewer.setSelection(new StructuredSelection(taskList.getUncategorizedCategory())); + categoryViewer.setSelection(new StructuredSelection(taskList.getAutomaticCategory())); categoryViewer.getControl().setEnabled(addToTaskListCheck.getSelection()); addToTaskListCheck.addSelectionListener(new SelectionAdapter() { @@ -337,7 +337,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { private boolean shouldAddToTaskList; - private AbstractTaskListElement selectedCategory; + private AbstractTaskContainer selectedCategory; public String[] getSelectedIds() { return selectedIds; @@ -355,7 +355,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { return shouldAddToTaskList; } - public AbstractTaskListElement getSelectedCategory() { + public AbstractTaskContainer getSelectedCategory() { return selectedCategory; } @@ -372,7 +372,7 @@ public class RemoteTaskSelectionDialog extends SelectionStatusDialog { } shouldAddToTaskList = addToTaskListCheck.getSelection(); if (shouldAddToTaskList) { - selectedCategory = (AbstractTaskListElement) ((IStructuredSelection) categoryViewer.getSelection()) + selectedCategory = (AbstractTaskContainer) ((IStructuredSelection) categoryViewer.getSelection()) .getFirstElement(); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java index 569aa75e8..0cab2ae63 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorActionContributor.java @@ -40,8 +40,7 @@ import org.eclipse.mylyn.internal.tasks.ui.actions.TaskActivateAction; import org.eclipse.mylyn.internal.tasks.ui.actions.TaskDeactivateAction; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor; @@ -171,12 +170,12 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib if (editor.getTaskEditorInput() == null && !(editor.getEditorInput() instanceof NewTaskEditorInput)) { final MenuManager subMenuManager = new MenuManager("Add to " + TaskListView.LABEL_VIEW); - List<AbstractTaskListElement> categories = new ArrayList<AbstractTaskListElement>(TasksUiPlugin + List<AbstractTaskContainer> categories = new ArrayList<AbstractTaskContainer>(TasksUiPlugin .getTaskListManager().getTaskList().getCategories()); // This is added to solve Bug 180252 Collections.sort(categories); - for (final AbstractTaskListElement category : categories) { + for (final AbstractTaskContainer category : categories) { if (!category.equals(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer())) { Action action = new Action() { @Override @@ -275,7 +274,7 @@ public class TaskEditorActionContributor extends MultiPageEditorActionBarContrib manager.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS)); } - private void moveToCategory(AbstractTaskListElement category) { + private void moveToCategory(AbstractTaskContainer category) { IEditorInput input = getEditor().getEditorInput(); if (input instanceof RepositoryTaskEditorInput) { RepositoryTaskEditorInput repositoryTaskEditorInput = (RepositoryTaskEditorInput) input; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java index 4b1775d8a..23fbe7e46 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityEditorInput.java @@ -19,8 +19,8 @@ import java.util.Set; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IEditorInput; import org.eclipse.ui.IPersistableElement; @@ -47,7 +47,7 @@ public class TaskActivityEditorInput implements IEditorInput { private Date reportStartDate = null; - public TaskActivityEditorInput(Date reportStartDate, Set<AbstractTaskListElement> chosenCategories, getAllCategories tlist) { + public TaskActivityEditorInput(Date reportStartDate, Set<AbstractTaskContainer> chosenCategories, TaskList tlist) { this.reportStartDate = reportStartDate; taskReportGenerator = new TaskReportGenerator(tlist, chosenCategories); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java index 69ed2598f..e858bbb7f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizard.java @@ -46,7 +46,7 @@ public class TaskActivityWizard extends Wizard implements INewWizard { if (page == null) return false; IEditorInput input = new TaskActivityEditorInput(planningGamePage.getReportStartDate(), planningGamePage - .getSelectedFilters(), TasksUiPlugin.getTaskListManager().getTaskList()); + .getSelectedContainers(), TasksUiPlugin.getTaskListManager().getTaskList()); page.openEditor(input, TaskPlanningEditor.ID_EDITOR_PLANNING); } catch (PartInitException ex) { MylarStatusHandler.log(ex, "couldn't open summary editor"); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java index 542056a5d..45e4e71c8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskActivityWizardPage.java @@ -19,7 +19,7 @@ import java.util.Set; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TaskListManager; @@ -291,12 +291,12 @@ public class TaskActivityWizardPage extends WizardPage { } - public Set<AbstractTaskListElement> getSelectedFilters() { - Set<AbstractTaskListElement> result = new HashSet<AbstractTaskListElement>(); + public Set<AbstractTaskContainer> getSelectedContainers() { + Set<AbstractTaskContainer> result = new HashSet<AbstractTaskContainer>(); TableItem[] items = filtersTable.getItems(); for (TableItem item : items) { - if (item.getChecked() && item.getData() instanceof AbstractTaskListElement) { - result.add((AbstractTaskListElement)item.getData()); + if (item.getChecked() && item.getData() instanceof AbstractTaskContainer) { + result.add((AbstractTaskContainer)item.getData()); } } return result; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java index aee457e1d..dcb030b81 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/planner/TaskReportGenerator.java @@ -23,10 +23,9 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.mylyn.core.MylarStatusHandler; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; /** * @author Ken Sueda @@ -39,21 +38,21 @@ public class TaskReportGenerator implements IRunnableWithProgress { private boolean finished; - private getAllCategories tasklist = null; + private TaskList tasklist = null; private List<ITaskCollector> collectors = new ArrayList<ITaskCollector>(); private List<AbstractTask> tasks = new ArrayList<AbstractTask>(); - private Set<AbstractTaskListElement> filterCategories; + private Set<AbstractTaskContainer> filterCategories; - public TaskReportGenerator(getAllCategories tlist) { + public TaskReportGenerator(TaskList tlist) { this(tlist, null); } - public TaskReportGenerator(getAllCategories tlist, Set<AbstractTaskListElement> filterCategories) { + public TaskReportGenerator(TaskList tlist, Set<AbstractTaskContainer> filterCategories) { tasklist = tlist; - this.filterCategories = filterCategories != null ? filterCategories : new HashSet<AbstractTaskListElement>(); + this.filterCategories = filterCategories != null ? filterCategories : new HashSet<AbstractTaskContainer>(); } public void addCollector(ITaskCollector collector) { @@ -72,7 +71,7 @@ public class TaskReportGenerator implements IRunnableWithProgress { public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException { - Set<AbstractTaskListElement> rootElements; + Set<AbstractTaskContainer> rootElements; if (filterCategories.size() == 0) { rootElements = tasklist.getRootElements(); } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java index d156ffbf7..e843f2852 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskListWriter.java @@ -49,7 +49,7 @@ import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskListExternalizer; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -100,7 +100,7 @@ public class TaskListWriter { this.delagatingExternalizer.setDelegateExternalizers(externalizers); } - public void writeTaskList(getAllCategories taskList, File outFile) { + public void writeTaskList(TaskList taskList, File outFile) { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder db; Document doc = null; @@ -247,7 +247,7 @@ public class TaskListWriter { /** * TODO: fix this old mess */ - public void readTaskList(getAllCategories taskList, File inFile, TaskDataManager taskDataManager) { + public void readTaskList(TaskList taskList, File inFile, TaskDataManager taskDataManager) { hasCaughtException = false; Map<AbstractTask, NodeList> tasksWithSubtasks = new HashMap<AbstractTask, NodeList>(); orphanedTaskNodes.clear(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java index 1a9dc366a..9fc3d5091 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java @@ -28,7 +28,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskArchive; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.UncategorizedCategory; +import org.eclipse.mylyn.tasks.core.AutomaticCategory; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi; @@ -85,7 +85,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro if (object instanceof TaskArchive) { compositeDescriptor.icon = TasksUiImages.CATEGORY_ARCHIVE; return compositeDescriptor; - } else if (object instanceof TaskCategory || object instanceof UncategorizedCategory) { + } else if (object instanceof TaskCategory || object instanceof AutomaticCategory) { compositeDescriptor.icon = TasksUiImages.CATEGORY; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java index c637d81db..ba5a05245 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListContentProvider.java @@ -23,8 +23,7 @@ import org.eclipse.mylyn.internal.tasks.ui.AbstractTaskListFilter; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskArchive; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -64,7 +63,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre // if (((ITask) child).getParent() != null) { // return ((ITask) child).getParent(); // } else { - return ((AbstractTask) child).getContainer(); + return ((AbstractTask) child).getCategory(); // } } return null; @@ -107,16 +106,17 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre return false; } - protected List<AbstractTaskListElement> applyFilter(Set<AbstractTaskListElement> roots) { + protected List<AbstractTaskContainer> applyFilter(Set<AbstractTaskContainer> roots) { String filterText = (this.view.getFilteredTree().getFilterControl()).getText(); if (containsNoFilterText(filterText)) { - List<AbstractTaskListElement> filteredRoots = new ArrayList<AbstractTaskListElement>(); - for (AbstractTaskListElement element : roots) { - if (element instanceof AbstractTask) { - if (!filter(null, element)) { - filteredRoots.add(element); - } - } else if (element instanceof AbstractRepositoryQuery) { + List<AbstractTaskContainer> filteredRoots = new ArrayList<AbstractTaskContainer>(); + for (AbstractTaskContainer element : roots) { +// if (element instanceof AbstractTask) { // this case should not happen anymore +// if (!filter(null, element)) { +// filteredRoots.add(element); +// } +// } else + if (element instanceof AbstractRepositoryQuery) { if (selectQuery((AbstractRepositoryQuery) element)) { filteredRoots.add(element); } @@ -128,7 +128,7 @@ public class TaskListContentProvider implements IStructuredContentProvider, ITre } return filteredRoots; } else { - return new ArrayList<AbstractTaskListElement>(roots); + return new ArrayList<AbstractTaskContainer>(roots); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index 73398acae..125982024 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -116,10 +116,10 @@ public class TaskListDropAdapter extends ViewerDropAdapter { TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer((TaskCategory) currentTarget, task); } else if (currentTarget instanceof AbstractTask) { AbstractTask targetTask = (AbstractTask) currentTarget; - if (targetTask.getContainer() == null) { + if (targetTask.getCategory() == null) { TasksUiPlugin.getTaskListManager().getTaskList().moveToRoot(task); } else { - TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(targetTask.getContainer(), task); + TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(targetTask.getCategory(), task); } } else if (currentTarget instanceof DateRangeContainer) { DateRangeContainer container = (DateRangeContainer)currentTarget; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java index acb440cf8..91d9382d2 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListTableSorter.java @@ -22,7 +22,7 @@ import org.eclipse.mylyn.tasks.core.DateRangeContainer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskArchive; -import org.eclipse.mylyn.tasks.core.UncategorizedCategory; +import org.eclipse.mylyn.tasks.core.AutomaticCategory; import org.eclipse.ui.PlatformUI; /** @@ -73,9 +73,9 @@ public class TaskListTableSorter extends ViewerSorter { } } - if (o1 instanceof UncategorizedCategory && o2 instanceof AbstractTaskListElement) { + if (o1 instanceof AutomaticCategory && o2 instanceof AbstractTaskListElement) { return -1; - } else if (o1 instanceof AbstractTaskListElement && o2 instanceof UncategorizedCategory) { + } else if (o1 instanceof AbstractTaskListElement && o2 instanceof AutomaticCategory) { return 1; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java index 2c4d0abcf..7a0c1a8e3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListView.java @@ -95,7 +95,7 @@ import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.TaskArchive; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.UncategorizedCategory; +import org.eclipse.mylyn.tasks.core.AutomaticCategory; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.ui.TaskTransfer; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -487,7 +487,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { // category might appear or disappear refresh(null); AbstractTaskListElement rootCategory = TasksUiPlugin.getTaskListManager().getTaskList() - .getUncategorizedCategory(); + .getAutomaticCategory(); if (rootCategory.equals(fromContainer) || rootCategory.equals(toContainer)) { refresh(null); } else { @@ -538,7 +538,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { // HACK: should be part of policy getViewer().refresh(false); } else if (container.equals(TasksUiPlugin.getTaskListManager().getTaskList() - .getUncategorizedCategory())) { + .getAutomaticCategory())) { refresh(null); } else { refresh(container); @@ -1241,7 +1241,7 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { } else if (action instanceof MarkTaskIncompleteAction) { action.setEnabled(false); } else if (action instanceof DeleteAction) { - if (element instanceof TaskArchive || element instanceof UncategorizedCategory) + if (element instanceof TaskArchive || element instanceof AutomaticCategory) action.setEnabled(false); else action.setEnabled(true); @@ -1613,15 +1613,15 @@ public class TaskListView extends ViewPart implements IPropertyChangeListener { if (element instanceof AbstractTask) { AbstractTask task = (AbstractTask) element; AbstractTaskListElement rootCategory = TasksUiPlugin.getTaskListManager().getTaskList() - .getUncategorizedCategory(); + .getAutomaticCategory(); Set<AbstractRepositoryQuery> queries = TasksUiPlugin.getTaskListManager().getTaskList() .getQueriesForHandle(task.getHandleIdentifier()); - if (task.getContainer() == null || task.getContainer().equals(rootCategory) + if (task.getCategory() == null || task.getCategory().equals(rootCategory) || (task instanceof AbstractTask && queries.isEmpty())) { // || task.getContainer() instanceof TaskArchive) { refresh(null); } else { - getViewer().refresh(task.getContainer(), true); + getViewer().refresh(task.getCategory(), true); // refresh(task.getContainer()); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java index 717f6e632..6703be67e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskScheduleContentProvider.java @@ -14,10 +14,12 @@ package org.eclipse.mylyn.internal.tasks.ui.views; import java.util.HashSet; import java.util.Set; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.DateRangeContainer; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.DateRangeContainer; +import org.eclipse.mylyn.tasks.core.TaskCategory; +import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.mylyn.tasks.ui.TaskListManager; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -30,6 +32,53 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { private TaskListManager taskListManager; + private UnscheduledCategory unscheduledCategory = new UnscheduledCategory(); + + class UnscheduledCategory extends TaskCategory { + + public static final String LABEL = "<Unscheduled>"; + + public static final String HANDLE = "unscheduled"; + + private AbstractTask activeTask = null; + + public UnscheduledCategory() { + super(HANDLE); + } + + public void setActiveTask(AbstractTask activeTask) { + this.activeTask = activeTask; + } + + @Override + public Set<AbstractTask> getChildren() { + Set<AbstractTask> customChildren = new HashSet<AbstractTask>(); + if (activeTask != null && activeTask.isActive()) { + customChildren.add(activeTask); + } + return customChildren; + } + + public String getPriority() { + return PriorityLevel.P1.toString(); + } + + @Override + public String getHandleIdentifier() { + return HANDLE; + } + + @Override + public String getSummary() { + return LABEL; + } + + @Override + public boolean canRename() { + return false; + } + } + public TaskScheduleContentProvider(TaskListView view, TaskListManager taskActivityManager) { super(view); this.taskListManager = taskActivityManager; @@ -37,9 +86,10 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { public Object[] getElements(Object parent) { if (parent.equals(this.view.getViewSite())) { - Set<AbstractTaskListElement> ranges = new HashSet<AbstractTaskListElement>(); + unscheduledCategory.activeTask = null; + Set<AbstractTaskContainer> ranges = new HashSet<AbstractTaskContainer>(); + ranges.addAll(taskListManager.getDateRanges()); - ranges.add(TasksUiPlugin.getTaskListManager().getTaskList().getArchiveContainer()); AbstractTask activeTask = TasksUiPlugin.getTaskListManager().getTaskList().getActiveTask(); boolean containsActiveTask = false; @@ -52,10 +102,11 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { } } if (!containsActiveTask) { - ranges.add(activeTask); + unscheduledCategory.activeTask = activeTask; + ranges.add(unscheduledCategory); +// ranges.add(activeTask); } } - return applyFilter(ranges).toArray(); } else { return super.getElements(parent); @@ -67,7 +118,7 @@ public class TaskScheduleContentProvider extends TaskListContentProvider { // DateRangeActivityDelegate dateRangeTaskWrapper = (DateRangeActivityDelegate) child; // return dateRangeTaskWrapper.getParent(); // } else { - return null; + return null; // } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java index 99c5ea65a..98c31fb7d 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/TaskDataImportWizard.java @@ -32,7 +32,7 @@ import org.eclipse.mylyn.internal.monitor.core.util.ZipFileUtil; import org.eclipse.mylyn.internal.tasks.ui.ITasksUiConstants; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IImportWizard; import org.eclipse.ui.IWorkbench; @@ -222,7 +222,7 @@ public class TaskDataImportWizard extends Wizard implements IImportWizard { /** Returns all tasks in the task list root or a category in the task list */ protected List<AbstractTask> getAllTasks() { List<AbstractTask> allTasks = new ArrayList<AbstractTask>(); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); allTasks.addAll(taskList.getRootTasks()); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java index d4e9d4a30..2a413761e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskElementFactory.java @@ -11,7 +11,7 @@ package org.eclipse.mylyn.internal.tasks.ui.workingset; import org.eclipse.core.runtime.IAdaptable; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; @@ -26,7 +26,7 @@ public class TaskElementFactory implements IElementFactory { public static final String HANDLE_ID = "handle"; public IAdaptable createElement(IMemento memento) { - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); String handle = memento.getString(HANDLE_ID); for (AbstractTaskListElement element : taskList.getRootElements()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java index cabc30a4c..361172607 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingset/TaskWorkingSetPage.java @@ -23,7 +23,7 @@ import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerSorter; import org.eclipse.jface.wizard.WizardPage; import org.eclipse.mylyn.internal.tasks.ui.views.TaskElementLabelProvider; -import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; @@ -180,7 +180,7 @@ public class TaskWorkingSetPage extends WizardPage implements IWorkingSetPage { tree.setSorter(new ViewerSorter()); ArrayList<Object> containers = new ArrayList<Object>(); - for (AbstractTaskListElement element : (Set<AbstractTaskListElement>) TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) { + for (AbstractTaskContainer element : (Set<AbstractTaskContainer>) TasksUiPlugin.getTaskListManager().getTaskList().getRootElements()) { if (element instanceof AbstractTaskListElement) { containers.add(element); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java index a5aa4c6ad..8c875a1e8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/RepositorySynchronizationManager.java @@ -30,7 +30,7 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; import org.eclipse.ui.PlatformUI; @@ -111,7 +111,7 @@ public class RepositorySynchronizationManager { public final Job synchronize(AbstractRepositoryConnector connector, final Set<AbstractRepositoryQuery> repositoryQueries, final IJobChangeListener listener, int priority, long delay, boolean syncChangedTasks, boolean userForcedSync) { - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); final SynchronizeQueryJob job = new SynchronizeQueryJob(this, connector, repositoryQueries, taskList); job.setSynchChangedTasks(syncChangedTasks); job.setForced(userForcedSync); @@ -177,7 +177,7 @@ public class RepositorySynchronizationManager { @Override public IStatus run(IProgressMonitor monitor) { - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); Set<AbstractTask> repositoryTasks = Collections.unmodifiableSet(taskList .getRepositoryTasks(repository.getUrl())); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java index 289725aa8..e3c3754fd 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/SynchronizeQueryJob.java @@ -28,7 +28,7 @@ import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryStatus; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.progress.IProgressConstants; @@ -49,14 +49,14 @@ class SynchronizeQueryJob extends Job { private boolean synchChangedTasks; - private getAllCategories taskList; + private TaskList taskList; // private RepositorySynchronizationManager synchronizationManager; private boolean forced = false; public SynchronizeQueryJob(RepositorySynchronizationManager synchronizationManager, - AbstractRepositoryConnector connector, Set<AbstractRepositoryQuery> queries, getAllCategories taskList) { + AbstractRepositoryConnector connector, Set<AbstractRepositoryQuery> queries, TaskList taskList) { super(JOB_LABEL + ": " + connector.getRepositoryType()); this.connector = connector; this.queries = queries; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskFactory.java index 9930b5aff..7a189b281 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskFactory.java @@ -16,7 +16,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskDataHandler; import org.eclipse.mylyn.tasks.core.ITaskFactory; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; /** @@ -32,7 +32,7 @@ public class TaskFactory implements ITaskFactory { private TaskRepository repository; - private getAllCategories taskList; + private TaskList taskList; //private TaskDataManager dataManager; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index ac0ab3597..5362386ed 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -62,7 +62,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.core.AbstractTask.PriorityLevel; import org.eclipse.swt.widgets.Display; @@ -148,7 +148,7 @@ public class TaskListManager implements IPropertyChangeListener { private TaskListSaveManager taskListSaveManager; // TODO: guard against overwriting the single instance? - private getAllCategories taskList = new getAllCategories(); + private TaskList taskList = new TaskList(); private TaskActivationHistory taskActivityHistory = new TaskActivationHistory(); @@ -255,7 +255,7 @@ public class TaskListManager implements IPropertyChangeListener { ContextCorePlugin.getContextManager().removeActivityMetaContextListener(CONTEXT_LISTENER); } - public getAllCategories resetTaskList() { + public TaskList resetTaskList() { resetActivity(); taskList.reset(); taskListInitialized = true; @@ -826,7 +826,7 @@ public class TaskListManager implements IPropertyChangeListener { } } - public getAllCategories getTaskList() { + public TaskList getTaskList() { return taskList; } @@ -1191,12 +1191,12 @@ public class TaskListManager implements IPropertyChangeListener { taskList.addTask(newTask, (TaskCategory) selectedObject); } else if (selectedObject instanceof AbstractTask) { AbstractTask task = (AbstractTask) selectedObject; - if (task.getContainer() instanceof TaskCategory) { - taskList.addTask(newTask, task.getContainer()); + if (task.getCategory() instanceof TaskCategory) { + taskList.addTask(newTask, task.getCategory()); } else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) { taskList.addTask(newTask, view.getDrilledIntoCategory()); } else { - taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getUncategorizedCategory()); + taskList.addTask(newTask, TasksUiPlugin.getTaskListManager().getTaskList().getAutomaticCategory()); } } else if (view != null && view.getDrilledIntoCategory() instanceof TaskCategory) { taskList.addTask(newTask, view.getDrilledIntoCategory()); @@ -1205,7 +1205,7 @@ public class TaskListManager implements IPropertyChangeListener { MessageDialog.openInformation(Display.getCurrent().getActiveShell(), ITasksUiConstants.TITLE_DIALOG, "The new task has been added to the root of the list, since tasks can not be added to a query."); } - taskList.addTask(newTask, taskList.getUncategorizedCategory()); + taskList.addTask(newTask, taskList.getAutomaticCategory()); } return newTask; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java index f277b5e0d..31b720d5a 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractNewRepositoryTaskEditor.java @@ -30,11 +30,12 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; import org.eclipse.mylyn.internal.tasks.ui.views.TaskListView; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; +import org.eclipse.mylyn.tasks.core.AutomaticCategory; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.TaskCategory; -import org.eclipse.mylyn.tasks.core.getAllCategories; -import org.eclipse.mylyn.tasks.core.UncategorizedCategory; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector; import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -363,8 +364,8 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractTaskEditor categoryChooser.setLayoutData(GridDataFactory.swtDefaults().hint(150, SWT.DEFAULT).create()); getManagedForm().getToolkit().adapt(categoryChooser, true, true); categoryChooser.setFont(TEXT_FONT); - getAllCategories taskList = TasksUiPlugin.getTaskListManager().getTaskList(); - List<AbstractTaskListElement> categories = taskList.getUserCategories(); + TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); + List<AbstractTaskContainer> categories = taskList.getUserCategories(); Collections.sort(categories, new Comparator<AbstractTaskListElement>() { public int compare(AbstractTaskListElement c1, AbstractTaskListElement c2) { @@ -372,7 +373,7 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractTaskEditor } }); - categoryChooser.add(UncategorizedCategory.LABEL); + categoryChooser.add(AutomaticCategory.LABEL); for (AbstractTaskListElement category : categories) { categoryChooser.add(category.getSummary()); } @@ -404,13 +405,13 @@ public abstract class AbstractNewRepositoryTaskEditor extends AbstractTaskEditor * added to, or null if it must not be added to the task list */ @SuppressWarnings("unchecked") - protected AbstractTaskListElement getCategory() { + protected AbstractTaskContainer getCategory() { int index = categoryChooser.getSelectionIndex(); if (addToCategory.getSelection() && index != -1) { if (index == 0) { - return TasksUiPlugin.getTaskListManager().getTaskList().getUncategorizedCategory(); + return TasksUiPlugin.getTaskListManager().getTaskList().getAutomaticCategory(); } - return ((List<AbstractTaskListElement>) categoryChooser.getData()).get(index - 1); + return ((List<AbstractTaskContainer>) categoryChooser.getData()).get(index - 1); } return null; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditor.java index 8d1912962..6bf023628 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditor.java @@ -79,8 +79,8 @@ import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskOutlinePage; import org.eclipse.mylyn.monitor.core.DateUtil; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; +import org.eclipse.mylyn.tasks.core.AbstractTaskContainer; import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; -import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.ITaskDataHandler; import org.eclipse.mylyn.tasks.core.ITaskListChangeListener; import org.eclipse.mylyn.tasks.core.RepositoryAttachment; @@ -2719,7 +2719,7 @@ public abstract class AbstractTaskEditor extends TaskFormPage { return null; } - protected AbstractTaskListElement getCategory() { + protected AbstractTaskContainer getCategory() { return null; } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java index 654a87c22..330cafc21 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/search/SearchHitCollector.java @@ -25,7 +25,7 @@ import org.eclipse.mylyn.tasks.core.ITaskFactory; import org.eclipse.mylyn.tasks.core.QueryHitCollector; import org.eclipse.mylyn.tasks.core.RepositoryStatus; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.search.ui.ISearchQuery; @@ -54,7 +54,7 @@ public class SearchHitCollector extends QueryHitCollector implements ISearchQuer private ITaskFactory taskFactory; - public SearchHitCollector(getAllCategories tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery, ITaskFactory taskFactory) { + public SearchHitCollector(TaskList tasklist, TaskRepository repository, AbstractRepositoryQuery repositoryQuery, ITaskFactory taskFactory) { super(tasklist, taskFactory); this.repository = repository; this.repositoryQuery = repositoryQuery; diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java index dab8b970c..ef6c0e956 100644 --- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java +++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java @@ -20,7 +20,7 @@ import org.eclipse.mylyn.tasks.core.AbstractTaskListElement; import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.TaskExternalizationException; -import org.eclipse.mylyn.tasks.core.getAllCategories; +import org.eclipse.mylyn.tasks.core.TaskList; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -66,7 +66,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList, + public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList, AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException { TracTask task = new TracTask(repositoryUrl, taskId, summary); return task; @@ -131,7 +131,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer { } @Override - public AbstractRepositoryQuery readQuery(Node node, getAllCategories taskList) throws TaskExternalizationException { + public AbstractRepositoryQuery readQuery(Node node, TaskList taskList) throws TaskExternalizationException { Element element = (Element) node; String repositoryUrl; String queryUrl; |