Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2007-06-13 04:00:39 -0400
committermkersten2007-06-13 04:00:39 -0400
commit883219bedc7c4bd2ae6ceede524c9cb3abdd4e00 (patch)
treed0a0f6bb45193a3314d824367b6b6f81014d288d /org.eclipse.mylyn.trac.ui
parentf2fb9bb4cd1e7b9906b9cccc96ba519f116c975a (diff)
downloadorg.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.tar.gz
org.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.tar.xz
org.eclipse.mylyn.tasks-883219bedc7c4bd2ae6ceede524c9cb3abdd4e00.zip
NEW - bug 124321: [api] merge local tasks with repository tasks
https://bugs.eclipse.org/bugs/show_bug.cgi?id=124321
Diffstat (limited to 'org.eclipse.mylyn.trac.ui')
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java12
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java18
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java6
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java6
5 files changed, 23 insertions, 23 deletions
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
index 55c0c2632..39df12532 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracRepositoryUi.java
@@ -27,8 +27,8 @@ import org.eclipse.mylyn.internal.trac.ui.wizard.NewTracQueryWizard;
import org.eclipse.mylyn.internal.trac.ui.wizard.TracCustomQueryPage;
import org.eclipse.mylyn.internal.trac.ui.wizard.TracRepositorySettingsPage;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.ITaskListElement;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
@@ -47,7 +47,7 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
return TracHyperlinkUtil.findHyperlinks(repository, text, lineOffset, regionOffset);
}
- public String getTaskKindLabel(AbstractRepositoryTask repositoryTask) {
+ public String getTaskKindLabel(AbstractTask repositoryTask) {
return "Ticket";
}
@@ -100,7 +100,7 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public ImageDescriptor getTaskKindOverlay(AbstractRepositoryTask task) {
+ public ImageDescriptor getTaskKindOverlay(AbstractTask task) {
Kind kind = Kind.fromString(task.getTaskKind());
if (kind == Kind.DEFECT) {
return TracImages.OVERLAY_DEFECT;
@@ -113,8 +113,8 @@ public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
}
@Override
- public List<ITaskListElement> getLegendItems() {
- List<ITaskListElement> legendItems = new ArrayList<ITaskListElement>();
+ public List<AbstractTaskListElement> getLegendItems() {
+ List<AbstractTaskListElement> legendItems = new ArrayList<AbstractTaskListElement>();
TracTask defect = new TracTask("", Kind.DEFECT.name(), Kind.DEFECT.toString());
defect.setKind(Kind.DEFECT.toString());
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 1b4536d48..dab8b970c 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
@@ -15,12 +15,12 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery;
import org.eclipse.mylyn.internal.trac.core.TracTask;
import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
-import org.eclipse.mylyn.tasks.core.AbstractTaskContainer;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
+import org.eclipse.mylyn.tasks.core.AbstractTaskListElement;
import org.eclipse.mylyn.tasks.core.DelegatingTaskExternalizer;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskExternalizationException;
-import org.eclipse.mylyn.tasks.core.TaskList;
+import org.eclipse.mylyn.tasks.core.getAllCategories;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -56,7 +56,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
// task related methods
@Override
- public boolean canCreateElementFor(ITask task) {
+ public boolean canCreateElementFor(AbstractTask task) {
return task instanceof TracTask;
}
@@ -66,8 +66,8 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
}
@Override
- public ITask createTask(String repositoryUrl, String taskId, String summary, Element element, TaskList taskList,
- AbstractTaskContainer category, ITask parent) throws TaskExternalizationException {
+ public AbstractTask createTask(String repositoryUrl, String taskId, String summary, Element element, getAllCategories taskList,
+ AbstractTaskListElement category, AbstractTask parent) throws TaskExternalizationException {
TracTask task = new TracTask(repositoryUrl, taskId, summary);
return task;
}
@@ -103,7 +103,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
node.setAttribute(KEY_REPOSITORY_URL, query.getRepositoryUrl());
node.setAttribute(KEY_QUERY, query.getUrl());
- for (AbstractRepositoryTask hit : query.getHits()) {
+ for (AbstractTask hit : query.getHits()) {
try {
Element element = null;
if (element == null) {
@@ -131,7 +131,7 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
}
@Override
- public AbstractRepositoryQuery readQuery(Node node, TaskList taskList) throws TaskExternalizationException {
+ public AbstractRepositoryQuery readQuery(Node node, getAllCategories taskList) throws TaskExternalizationException {
Element element = (Element) node;
String repositoryUrl;
String queryUrl;
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
index c08cdc908..195df3695 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
@@ -8,13 +8,13 @@
package org.eclipse.mylyn.internal.trac.ui.editor;
-import org.eclipse.mylyn.tasks.ui.editors.AbstractRepositoryTaskEditor;
+import org.eclipse.mylyn.tasks.ui.editors.AbstractTaskEditor;
import org.eclipse.ui.forms.editor.FormEditor;
/**
* @author Steffen Pingel
*/
-public class TracTaskEditor extends AbstractRepositoryTaskEditor {
+public class TracTaskEditor extends AbstractTaskEditor {
public TracTaskEditor(FormEditor editor) {
super(editor);
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
index c3ca88b05..addac39b5 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
@@ -11,7 +11,7 @@ import org.eclipse.mylyn.core.MylarStatusHandler;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
import org.eclipse.mylyn.internal.trac.core.TracTask;
-import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.tasks.ui.editors.ITaskEditorFactory;
@@ -26,7 +26,7 @@ import org.eclipse.ui.IEditorPart;
*/
public class TracTaskEditorFactory implements ITaskEditorFactory {
- public boolean canCreateEditorFor(ITask task) {
+ public boolean canCreateEditorFor(AbstractTask task) {
if (task instanceof TracTask) {
TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(
TracCorePlugin.REPOSITORY_KIND, ((TracTask) task).getRepositoryUrl());
@@ -64,7 +64,7 @@ public class TracTaskEditorFactory implements ITaskEditorFactory {
return null;
}
- public IEditorInput createEditorInput(ITask task) {
+ public IEditorInput createEditorInput(AbstractTask task) {
TracTask tracTask = (TracTask) task;
TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND,
tracTask.getRepositoryUrl());
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
index bbf4474c8..fdcadf747 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
@@ -24,7 +24,7 @@ import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
import org.eclipse.mylyn.internal.trac.core.TracTaskDataHandler;
import org.eclipse.mylyn.internal.trac.ui.TracUiPlugin;
import org.eclipse.mylyn.tasks.core.AbstractAttributeFactory;
-import org.eclipse.mylyn.tasks.core.AbstractRepositoryTask;
+import org.eclipse.mylyn.tasks.core.AbstractTask;
import org.eclipse.mylyn.tasks.core.RepositoryTaskData;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUiPlugin;
@@ -132,9 +132,9 @@ public class NewTracTaskPage extends WizardPage {
}
TracTaskDataHandler offlineHandler = (TracTaskDataHandler) connector.getTaskDataHandler();
- AbstractAttributeFactory attributeFactory = offlineHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getKind(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ AbstractAttributeFactory attributeFactory = offlineHandler.getAttributeFactory(taskRepository.getUrl(), taskRepository.getKind(), AbstractTask.DEFAULT_TASK_KIND);
this.taskData = new RepositoryTaskData(attributeFactory, TracCorePlugin.REPOSITORY_KIND,
- taskRepository.getUrl(), TasksUiPlugin.getDefault().getNextNewRepositoryTaskId(), AbstractRepositoryTask.DEFAULT_TASK_KIND);
+ taskRepository.getUrl(), TasksUiPlugin.getDefault().getNextNewRepositoryTaskId(), AbstractTask.DEFAULT_TASK_KIND);
this.taskData.setNew(true);
TracTaskDataHandler.createDefaultAttributes(taskData.getAttributeFactory(), taskData, client, false);
}

Back to the top