Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2008-05-08 05:45:47 +0000
committerspingel2008-05-08 05:45:47 +0000
commitc72c835b1aa355c0b1fe2127c3eb2df3f1e7c1c3 (patch)
treee660876e220ab837cba2647a33cb8c5ed9dacee0 /org.eclipse.mylyn.trac.ui/src/org/eclipse
parentfb5855a3b1c36d6b59e19a3505ebfec1ee3e1b18 (diff)
downloadorg.eclipse.mylyn.tasks-c72c835b1aa355c0b1fe2127c3eb2df3f1e7c1c3.tar.gz
org.eclipse.mylyn.tasks-c72c835b1aa355c0b1fe2127c3eb2df3f1e7c1c3.tar.xz
org.eclipse.mylyn.tasks-c72c835b1aa355c0b1fe2127c3eb2df3f1e7c1c3.zip
NEW - bug 229487: [api] manage task list structure internally
https://bugs.eclipse.org/bugs/show_bug.cgi?id=229487
Diffstat (limited to 'org.eclipse.mylyn.trac.ui/src/org/eclipse')
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java13
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java9
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracDuplicateDetector.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/EditTracQueryWizard.java8
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java4
7 files changed, 23 insertions, 23 deletions
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
index f2cc74ab0..dcf160301 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracConnectorUi.java
@@ -15,9 +15,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.text.hyperlink.IHyperlink;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
-import org.eclipse.mylyn.internal.tasks.core.AbstractTaskContainer;
-import org.eclipse.mylyn.internal.tasks.core.deprecated.TaskSelection;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracCorePlugin;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryConnector;
@@ -28,7 +25,9 @@ import org.eclipse.mylyn.internal.trac.ui.wizard.EditTracQueryWizard;
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.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.ITask;
+import org.eclipse.mylyn.tasks.core.ITaskMapping;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositorySettingsPage;
@@ -68,7 +67,7 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi {
}
@Override
- public IWizard getNewTaskWizard(TaskRepository repository, TaskSelection selection) {
+ public IWizard getNewTaskWizard(TaskRepository repository, ITaskMapping selection) {
if (TracRepositoryConnector.hasRichEditor(repository)) {
return new NewTaskWizard(repository, selection);
} else {
@@ -78,7 +77,7 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi {
}
@Override
- public IWizard getQueryWizard(TaskRepository repository, AbstractRepositoryQuery query) {
+ public IWizard getQueryWizard(TaskRepository repository, IRepositoryQuery query) {
if (query instanceof TracRepositoryQuery) {
return new EditTracQueryWizard(repository, query);
} else {
@@ -105,8 +104,8 @@ public class TracConnectorUi extends AbstractRepositoryConnectorUi {
}
@Override
- public List<AbstractTaskContainer> getLegendItems() {
- List<AbstractTaskContainer> legendItems = new ArrayList<AbstractTaskContainer>();
+ public List<ITask> getLegendItems() {
+ List<ITask> legendItems = new ArrayList<ITask>();
TracTask defect = new TracTask("", Kind.DEFECT.name(), Kind.DEFECT.toString());
defect.setTaskKind(Kind.DEFECT.toString());
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
index c4b57c53a..b4cf51508 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskListFactory.java
@@ -11,11 +11,12 @@ package org.eclipse.mylyn.internal.trac.ui;
import java.util.HashSet;
import java.util.Set;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
+import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
import org.eclipse.mylyn.internal.tasks.core.deprecated.AbstractTaskListFactory;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery;
import org.eclipse.mylyn.internal.trac.core.TracTask;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.ITask;
import org.w3c.dom.Element;
@@ -51,12 +52,12 @@ public class TracTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public boolean canCreate(AbstractRepositoryQuery category) {
+ public boolean canCreate(IRepositoryQuery category) {
return category instanceof TracRepositoryQuery;
}
@Override
- public String getQueryElementName(AbstractRepositoryQuery query) {
+ public String getQueryElementName(IRepositoryQuery query) {
return query instanceof TracRepositoryQuery ? KEY_TRAC_QUERY : "";
}
@@ -73,7 +74,7 @@ public class TracTaskListFactory extends AbstractTaskListFactory {
}
@Override
- public AbstractRepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) {
+ public RepositoryQuery createQuery(String repositoryUrl, String queryString, String label, Element element) {
return new TracRepositoryQuery(repositoryUrl, queryString, label);
}
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracDuplicateDetector.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracDuplicateDetector.java
index 885940cdd..22f069348 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracDuplicateDetector.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracDuplicateDetector.java
@@ -8,7 +8,7 @@
package org.eclipse.mylyn.internal.trac.ui.editor;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
+import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
import org.eclipse.mylyn.internal.tasks.core.deprecated.AbstractDuplicateDetector;
import org.eclipse.mylyn.internal.tasks.core.deprecated.RepositoryTaskData;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
@@ -21,7 +21,7 @@ import org.eclipse.mylyn.tasks.core.TaskRepository;
public class TracDuplicateDetector extends AbstractDuplicateDetector {
@Override
- public AbstractRepositoryQuery getDuplicatesQuery(TaskRepository repository, RepositoryTaskData taskData) {
+ public RepositoryQuery getDuplicatesQuery(TaskRepository repository, RepositoryTaskData taskData) {
TracSearchFilter filter = new TracSearchFilter("description");
filter.setOperator(CompareOperator.CONTAINS);
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/EditTracQueryWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/EditTracQueryWizard.java
index f8afa4767..63eeca92c 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/EditTracQueryWizard.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/EditTracQueryWizard.java
@@ -8,18 +8,18 @@
package org.eclipse.mylyn.internal.trac.ui.wizard;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.TaskRepository;
-import org.eclipse.mylyn.tasks.ui.wizards.AbstractEditQueryWizard;
+import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryWizard;
/**
* @author Steffen Pingel
*/
-public class EditTracQueryWizard extends AbstractEditQueryWizard {
+public class EditTracQueryWizard extends AbstractRepositoryQueryWizard {
// private TracCustomQueryPage queryPage;
- public EditTracQueryWizard(TaskRepository repository, AbstractRepositoryQuery query) {
+ public EditTracQueryWizard(TaskRepository repository, IRepositoryQuery query) {
super(repository, query);
}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
index 56b343e52..ca2907d6d 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracQueryWizard.java
@@ -9,7 +9,7 @@
package org.eclipse.mylyn.internal.trac.ui.wizard;
import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
+import org.eclipse.mylyn.internal.tasks.core.RepositoryQuery;
import org.eclipse.mylyn.internal.tasks.core.deprecated.AbstractLegacyRepositoryConnector;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages;
import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
@@ -49,7 +49,7 @@ public class NewTracQueryWizard extends Wizard {
@Override
public boolean performFinish() {
- AbstractRepositoryQuery query = queryPage.getQuery();
+ RepositoryQuery query = queryPage.getQuery();
if (query != null) {
TasksUi.getTaskList().addQuery(query);
AbstractLegacyRepositoryConnector connector = (AbstractLegacyRepositoryConnector) TasksUi.getRepositoryManager()
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
index 04753f970..6682665e5 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracCustomQueryPage.java
@@ -18,7 +18,6 @@ import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager;
import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiInternal;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
@@ -30,6 +29,7 @@ import org.eclipse.mylyn.internal.trac.core.model.TracSearch;
import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter;
import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter.CompareOperator;
import org.eclipse.mylyn.internal.trac.ui.TracUiPlugin;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.mylyn.tasks.ui.TasksUi;
import org.eclipse.mylyn.tasks.ui.wizards.AbstractRepositoryQueryPage;
@@ -113,7 +113,7 @@ public class TracCustomQueryPage extends AbstractRepositoryQueryPage {
//
// private UserSearchField ccField;
- public TracCustomQueryPage(TaskRepository repository, AbstractRepositoryQuery query) {
+ public TracCustomQueryPage(TaskRepository repository, IRepositoryQuery query) {
super(TITLE, repository);
this.query = (TracRepositoryQuery) query;
setTitle(TITLE);
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
index e99b78cdf..1a2c5d2b8 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracQueryWizardPage.java
@@ -17,13 +17,13 @@ import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylyn.commons.core.StatusHandler;
-import org.eclipse.mylyn.internal.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylyn.internal.trac.core.ITracClient;
import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery;
import org.eclipse.mylyn.internal.trac.core.model.TracSearch;
import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter;
import org.eclipse.mylyn.internal.trac.core.model.TracSearchFilter.CompareOperator;
import org.eclipse.mylyn.internal.trac.ui.TracUiPlugin;
+import org.eclipse.mylyn.tasks.core.IRepositoryQuery;
import org.eclipse.mylyn.tasks.core.TaskRepository;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.ScrolledComposite;
@@ -65,7 +65,7 @@ public class TracQueryWizardPage extends WizardPage {
private List<SearchField> searchFields;
- public TracQueryWizardPage(TaskRepository repository, AbstractRepositoryQuery query) {
+ public TracQueryWizardPage(TaskRepository repository, IRepositoryQuery query) {
super(TITLE);
this.repository = repository;

Back to the top