Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormkersten2006-08-25 12:05:42 -0400
committermkersten2006-08-25 12:05:42 -0400
commitf1dc31ab0020a32d539d25ec1860c8c9cd697f49 (patch)
treea2536f745fe939e1cbd43a601591bac3cb99dd64
parentcf0b994bf1db9c3d120f04e07595d8f6cec4520f (diff)
downloadorg.eclipse.mylyn.tasks-f1dc31ab0020a32d539d25ec1860c8c9cd697f49.tar.gz
org.eclipse.mylyn.tasks-f1dc31ab0020a32d539d25ec1860c8c9cd697f49.tar.xz
org.eclipse.mylyn.tasks-f1dc31ab0020a32d539d25ec1860c8c9cd697f49.zip
Progress on: 149981: extract tasks framework from mylar.tasklist
https://bugs.eclipse.org/bugs/show_bug.cgi?id=149981
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/plugin.xml5
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java4
-rw-r--r--org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/plugin.xml4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/schema/repositories.exsd8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySearchPage.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskElementLabelProvider.java8
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryTaskPage.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java (renamed from org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryUi.java)2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java8
-rw-r--r--org.eclipse.mylyn.trac.ui/plugin.xml6
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java4
-rw-r--r--org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java4
24 files changed, 59 insertions, 58 deletions
diff --git a/org.eclipse.mylyn.bugzilla.ui/plugin.xml b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
index f78648d3d..591c2812d 100644
--- a/org.eclipse.mylyn.bugzilla.ui/plugin.xml
+++ b/org.eclipse.mylyn.bugzilla.ui/plugin.xml
@@ -27,14 +27,13 @@
name="Bugzilla Repository"
point="org.eclipse.mylar.tasks.ui.repositories">
- <repositoryConnector
-
+ <connectorCore
class="org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositoryConnector"
id="org.eclipse.mylar.bugzilla.tasklist.repositories"
name="Bugzilla Repository Connector"
type="bugzilla"/>
- <repositoryUi
+ <connectorUi
brandingIcon="icons/eview16/bugzilla-logo.gif"
class="org.eclipse.mylar.internal.bugzilla.ui.tasklist.BugzillaRepositoryUi"
name="Bugzilla Repository Ui"/>
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
index f95d916fe..f4b973489 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositorySettingsPage.java
@@ -29,7 +29,7 @@ import org.eclipse.mylar.internal.bugzilla.core.IBugzillaConstants;
import org.eclipse.mylar.internal.tasks.core.WebClientUtil;
import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.mylar.tasks.core.RepositoryTemplate;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -52,7 +52,7 @@ public class BugzillaRepositorySettingsPage extends AbstractRepositorySettingsPa
protected Combo repositoryVersionCombo;
- public BugzillaRepositorySettingsPage(AbstractRepositoryUi repositoryUi) {
+ public BugzillaRepositorySettingsPage(AbstractRepositoryConnectorUi repositoryUi) {
super(TITLE, DESCRIPTION, repositoryUi);
setNeedsAnonymousLogin(true);
setNeedsEncoding(true);
diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
index 79b72bc8b..4eaf6ce06 100644
--- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
+++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaRepositoryUi.java
@@ -23,7 +23,7 @@ import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage;
import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -31,7 +31,7 @@ import org.eclipse.ui.PlatformUI;
/**
* @author Mik Kersten
*/
-public class BugzillaRepositoryUi extends AbstractRepositoryUi {
+public class BugzillaRepositoryUi extends AbstractRepositoryConnectorUi {
public AbstractRepositorySettingsPage getSettingsPage() {
return new BugzillaRepositorySettingsPage(this);
diff --git a/org.eclipse.mylyn.tasks.tests/plugin.xml b/org.eclipse.mylyn.tasks.tests/plugin.xml
index 9e6ae2dd5..c1f9604c1 100644
--- a/org.eclipse.mylyn.tasks.tests/plugin.xml
+++ b/org.eclipse.mylyn.tasks.tests/plugin.xml
@@ -7,12 +7,12 @@
name="JIRA Repository"
point="org.eclipse.mylar.tasks.ui.repositories">
- <repositoryConnector
+ <connectorCore
class="org.eclipse.mylar.tasks.tests.connector.MockRepositoryConnector"
id="org.eclipse.mylar.tasklist.tests.repositories"
name="Mock Repository Client"
type="mock"/>
- <externalizer
+ <connectorUi
class="org.eclipse.mylar.tasks.tests.connector.MockRepositoryExternalizer"
id="org.eclipse.mylar.tasklist.tests.externalizer"/>
</extension>
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
index 8bc691f28..939ab1973 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.preference.StringFieldEditor;
import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.mylar.tasks.core.TaskRepository;
import org.eclipse.mylar.tasks.tests.connector.MockRepositoryUi;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
@@ -129,7 +129,7 @@ public class RepositorySettingsPageTest extends TestCase {
private Composite parent;
- public MockRepositorySettingsPage(AbstractRepositoryUi repositoryUi) {
+ public MockRepositorySettingsPage(AbstractRepositoryConnectorUi repositoryUi) {
super("title", "description", repositoryUi);
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java
index 1504b7e76..645e4af7c 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryUi.java
@@ -13,12 +13,12 @@ import org.eclipse.jface.wizard.IWizard;
import org.eclipse.mylar.internal.tasks.ui.wizards.AbstractRepositorySettingsPage;
import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
/**
* @author Mik Kersten
*/
-public class MockRepositoryUi extends AbstractRepositoryUi {
+public class MockRepositoryUi extends AbstractRepositoryConnectorUi {
@Override
public IWizard getNewQueryWizard(TaskRepository repository, IStructuredSelection selection) {
diff --git a/org.eclipse.mylyn.tasks.ui/schema/repositories.exsd b/org.eclipse.mylyn.tasks.ui/schema/repositories.exsd
index 81860a31f..e587b288e 100644
--- a/org.eclipse.mylyn.tasks.ui/schema/repositories.exsd
+++ b/org.eclipse.mylyn.tasks.ui/schema/repositories.exsd
@@ -18,9 +18,9 @@
</annotation>
<complexType>
<sequence>
- <element ref="repositoryConnector"/>
+ <element ref="connectorCore"/>
<element ref="externalizer"/>
- <element ref="repositoryUi"/>
+ <element ref="connectorUi"/>
</sequence>
<attribute name="point" type="string" use="required">
<annotation>
@@ -89,7 +89,7 @@
</complexType>
</element>
- <element name="repositoryConnector">
+ <element name="connectorCore">
<annotation>
<documentation>
(no description available)
@@ -130,7 +130,7 @@
</complexType>
</element>
- <element name="repositoryUi">
+ <element name="connectorUi">
<annotation>
<documentation>
(no description available)
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySearchPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySearchPage.java
index 50959ed0b..979bd24a1 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySearchPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySearchPage.java
@@ -20,7 +20,7 @@ import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylar.internal.tasks.ui.search.AbstractRepositoryQueryPage;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TaskRepositoryManager;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.search.ui.ISearchPage;
@@ -106,7 +106,7 @@ public class RepositorySearchPage extends DialogPage implements ISearchPage {
private WizardPage createPage(TaskRepository repository) {
if (repository != null) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
repository.getKind());
if (connectorUi != null) {
WizardPage searchPage = connectorUi.getSearchPage(repository, null);
@@ -159,7 +159,7 @@ public class RepositorySearchPage extends DialogPage implements ISearchPage {
List<TaskRepository> repositories = TasksUiPlugin.getRepositoryManager().getAllRepositories();
List<TaskRepository> searchableRepositories = new ArrayList<TaskRepository>();
for (TaskRepository repository : repositories) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
repository.getKind());
if (connectorUi != null && connectorUi.hasSearchPage()) {
searchableRepositories.add(repository);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java
index 3ef4b6ca3..38a0d84e4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositoryTaskDecorator.java
@@ -23,7 +23,7 @@ import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
import org.eclipse.mylar.tasks.core.ITask;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
/**
@@ -49,7 +49,7 @@ public class RepositoryTaskDecorator implements ILightweightLabelDecorator {
} else if (element instanceof AbstractRepositoryTask) {
AbstractRepositoryTask task = (AbstractRepositoryTask)element;
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(task.getRepositoryKind());
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
task.getRepositoryKind());
TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(task.getRepositoryKind(), task.getRepositoryUrl());
if (!connectorUi.hasRichEditor()) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java
index ea8f57324..3c3c17d88 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskUiUtil.java
@@ -35,7 +35,7 @@ import org.eclipse.mylar.tasks.core.ITaskListElement;
import org.eclipse.mylar.tasks.core.Task;
import org.eclipse.mylar.tasks.core.TaskCategory;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
@@ -120,7 +120,7 @@ public class TaskUiUtil {
} else {
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryForTaskUrl(
fullUrl);
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
connector.getRepositoryType());
if (connector != null) {
@@ -181,7 +181,7 @@ public class TaskUiUtil {
TaskUiUtil.openEditor((AbstractTaskContainer) element);
} else if (element instanceof AbstractRepositoryQuery) {
AbstractRepositoryQuery query = (AbstractRepositoryQuery) element;
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
query.getRepositoryKind());
connectorUi.openEditQueryDialog(query);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
index 78b4d30aa..2bae1c4be 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TasksUiExtensionReader.java
@@ -28,7 +28,7 @@ import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.ITaskListExternalizer;
import org.eclipse.mylar.tasks.core.RepositoryTemplate;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.plugin.AbstractUIPlugin;
@@ -65,9 +65,9 @@ public class TasksUiExtensionReader {
public static final String ELMNT_TMPL_ADDAUTO = "addAutomatically";
- public static final String ELMNT_REPOSITORY_CONNECTOR = "repositoryConnector";
+ public static final String ELMNT_REPOSITORY_CONNECTOR = "connectorCore";
- public static final String ELMNT_REPOSITORY_UI= "repositoryUi";
+ public static final String ELMNT_REPOSITORY_UI= "connectorUi";
public static final String ELMNT_EXTERNALIZER = "externalizer";
@@ -205,7 +205,7 @@ public class TasksUiExtensionReader {
Object type = element.getAttribute(ELMNT_TYPE);
Object repository = element.createExecutableExtension(ATTR_CLASS);
if (repository instanceof AbstractRepositoryConnector && type != null) {
- TasksUiPlugin.getRepositoryManager().addRepositoryUi((AbstractRepositoryUi) repository);
+ TasksUiPlugin.getRepositoryManager().addRepositoryUi((AbstractRepositoryConnectorUi) repository);
String iconPath = element.getAttribute(ATTR_BRANDING_ICON);
if (iconPath != null) {
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 3fd9319d1..bb9b51ab5 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
@@ -25,7 +25,7 @@ import org.eclipse.mylar.tasks.core.ITask;
import org.eclipse.mylar.tasks.core.ITaskListElement;
import org.eclipse.mylar.tasks.core.TaskArchive;
import org.eclipse.mylar.tasks.core.TaskCategory;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.Font;
@@ -60,7 +60,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
// TODO: fix this mess that delaying decoration got us into
if (task.isCompleted()) {
if (task instanceof AbstractRepositoryTask) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
((AbstractRepositoryTask)task).getRepositoryKind());
if (connectorUi != null && !connectorUi.hasRichEditor()) {
return TaskListImages.getImage(TaskListImages.TASK_COMPLETED);
@@ -72,7 +72,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
}
} else if (task.getNotes() != null && !task.getNotes().trim().equals("")) {
if (task instanceof AbstractRepositoryTask) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
((AbstractRepositoryTask)task).getRepositoryKind());
if (connectorUi != null && !connectorUi.hasRichEditor()) {
return TaskListImages.getImage(TaskListImages.TASK_NOTES);
@@ -84,7 +84,7 @@ public class TaskElementLabelProvider extends LabelProvider implements IColorPro
}
} else {
if (task instanceof AbstractRepositoryTask) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
((AbstractRepositoryTask)task).getRepositoryKind());
if (connectorUi != null && !connectorUi.hasRichEditor()) {
return TaskListImages.getImage(TaskListImages.TASK);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java
index e369534c0..d93c353b7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositoryClientWizard.java
@@ -16,7 +16,7 @@ import java.util.Collection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.INewWizard;
@@ -50,7 +50,7 @@ public abstract class AbstractRepositoryClientWizard extends Wizard implements I
if (connectors.size() == 1) {
AbstractRepositoryConnector connector = connectors.toArray(new AbstractRepositoryConnector[1])[0];
setRepositoryConnector(connector);
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
connector.getRepositoryType());
AbstractRepositorySettingsPage nextPage = connectorUi.getSettingsPage();
setRepositorySettingsPage(nextPage);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index cea9ce1af..6d9a8c834 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -23,7 +23,7 @@ import org.eclipse.mylar.context.core.MylarStatusHandler;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.IRepositoryConstants;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
@@ -98,7 +98,7 @@ public abstract class AbstractRepositorySettingsPage extends WizardPage {
private String originalUrl;
- public AbstractRepositorySettingsPage(String title, String description, AbstractRepositoryUi repositoryUi) {
+ public AbstractRepositorySettingsPage(String title, String description, AbstractRepositoryConnectorUi repositoryUi) {
super(title);
super.setTitle(title);
super.setDescription(description);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
index 4bac775cd..887b7e31b 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AddExistingTaskWizard.java
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
/**
@@ -44,7 +44,7 @@ public class AddExistingTaskWizard extends MultiRepositoryAwareWizard {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
taskRepository.getKind());
return connectorUi.getAddExistingTaskWizard(taskRepository);
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
index d88ba668c..b401543e5 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/EditRepositoryWizard.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.mylar.internal.tasks.ui.TaskListImages;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
@@ -34,7 +34,7 @@ public class EditRepositoryWizard extends Wizard implements INewWizard {
public EditRepositoryWizard(TaskRepository repository) {
super();
this.repository = repository;
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
repository.getKind());
abstractRepositorySettingsPage = connectorUi.getSettingsPage();
abstractRepositorySettingsPage.setRepository(repository);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
index 720d59a0c..adbad71dc 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewQueryWizard.java
@@ -14,7 +14,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
/**
@@ -36,7 +36,7 @@ public class NewQueryWizard extends MultiRepositoryAwareWizard {
private static final class SelectRepositoryPageForNewQuery extends SelectRepositoryPage {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
- AbstractRepositoryUi repositoryUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(taskRepository.getKind());
+ AbstractRepositoryConnectorUi repositoryUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(taskRepository.getKind());
return repositoryUi.getNewQueryWizard(taskRepository, getSelection());
}
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryTaskPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryTaskPage.java
index b298d6f8f..6b0c50475 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryTaskPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/NewRepositoryTaskPage.java
@@ -13,7 +13,7 @@ package org.eclipse.mylar.internal.tasks.ui.wizards;
import org.eclipse.jface.wizard.IWizard;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
@@ -32,7 +32,7 @@ public class NewRepositoryTaskPage extends SelectRepositoryPage {
@Override
protected IWizard createWizard(TaskRepository taskRepository) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
taskRepository.getKind());
return connectorUi.getNewTaskWizard(taskRepository, getSelection());
}
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java
index f0af6df39..00859fcf7 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/SelectRepositoryClientPage.java
@@ -21,7 +21,7 @@ import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.mylar.internal.tasks.ui.views.TaskRepositoryLabelProvider;
import org.eclipse.mylar.tasks.core.AbstractRepositoryConnector;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
@@ -93,7 +93,7 @@ public class SelectRepositoryClientPage extends WizardPage {
@Override
public IWizardPage getNextPage() {
if (isPageComplete()) {
- AbstractRepositoryUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
+ AbstractRepositoryConnectorUi connectorUi = TasksUiPlugin.getRepositoryManager().getRepositoryUi(
wizard.getRepositoryConnector().getRepositoryType());
AbstractRepositorySettingsPage nextPage = connectorUi.getSettingsPage();
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryUi.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
index 9e0746604..1f34137f4 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryUi.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/AbstractRepositoryConnectorUi.java
@@ -21,7 +21,7 @@ import org.eclipse.ui.PlatformUI;
/**
* @author Mik Kersten
*/
-public abstract class AbstractRepositoryUi {
+public abstract class AbstractRepositoryConnectorUi {
/**
* @return the unique type of the repository, e.g. "bugzilla"
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
index 2e8ef13ab..744933df9 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskRepositoryManager.java
@@ -40,7 +40,7 @@ public class TaskRepositoryManager {
private Map<String, AbstractRepositoryConnector> repositoryConnectors = new HashMap<String, AbstractRepositoryConnector>();
- private Map<String, AbstractRepositoryUi> repositoryConnectorUis = new HashMap<String, AbstractRepositoryUi>();
+ private Map<String, AbstractRepositoryConnectorUi> repositoryConnectorUis = new HashMap<String, AbstractRepositoryConnectorUi>();
private Map<String, Set<TaskRepository>> repositoryMap = new HashMap<String, Set<TaskRepository>>();
@@ -68,15 +68,15 @@ public class TaskRepositoryManager {
}
}
- public Collection<AbstractRepositoryUi> getRepositoryUis() {
+ public Collection<AbstractRepositoryConnectorUi> getRepositoryUis() {
return Collections.unmodifiableCollection(repositoryConnectorUis.values());
}
- public AbstractRepositoryUi getRepositoryUi(String kind) {
+ public AbstractRepositoryConnectorUi getRepositoryUi(String kind) {
return repositoryConnectorUis.get(kind);
}
- public void addRepositoryUi(AbstractRepositoryUi repositoryConnectorUi) {
+ public void addRepositoryUi(AbstractRepositoryConnectorUi repositoryConnectorUi) {
if (!repositoryConnectorUis.values().contains(repositoryConnectorUi)) {
repositoryConnectorUis.put(repositoryConnectorUi.getRepositoryType(), repositoryConnectorUi);
}
diff --git a/org.eclipse.mylyn.trac.ui/plugin.xml b/org.eclipse.mylyn.trac.ui/plugin.xml
index 7a75cb6fd..9851196c3 100644
--- a/org.eclipse.mylyn.trac.ui/plugin.xml
+++ b/org.eclipse.mylyn.trac.ui/plugin.xml
@@ -5,12 +5,14 @@
id="org.eclipse.mylar.trac.repository"
name="Trac Repository"
point="org.eclipse.mylar.tasks.ui.repositories">
- <repositoryType
- brandingIcon="icons/eview16/trac-icon.gif"
+ <connectorCore
class="org.eclipse.mylar.internal.trac.TracRepositoryConnector"
id="org.eclipse.mylar.trac.tasklist.repositories"
name="Trac Repository Client"
type="trac"/>
+ <connectorUi
+ class="org.eclipse.mylar.internal.trac.TracRepositoryUi"
+ brandingIcon="icons/eview16/trac-icon.gif"/>
<externalizer
class="org.eclipse.mylar.internal.trac.TracTaskExternalizer"
id="org.eclipse.mylar.trac.tasklist.externalizer"/>
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java
index 12b1c0a92..091a5bae5 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/TracRepositoryUi.java
@@ -23,7 +23,7 @@ import org.eclipse.mylar.internal.trac.ui.wizard.TracCustomQueryPage;
import org.eclipse.mylar.internal.trac.ui.wizard.TracRepositorySettingsPage;
import org.eclipse.mylar.tasks.core.AbstractRepositoryQuery;
import org.eclipse.mylar.tasks.core.TaskRepository;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
@@ -32,7 +32,7 @@ import org.eclipse.ui.PlatformUI;
* @author Mik Kersten
* @author Steffen Pingel
*/
-public class TracRepositoryUi extends AbstractRepositoryUi {
+public class TracRepositoryUi extends AbstractRepositoryConnectorUi {
@Override
public AbstractRepositorySettingsPage getSettingsPage() {
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
index 8efea3ffd..b4b1380ac 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/TracRepositorySettingsPage.java
@@ -26,7 +26,7 @@ import org.eclipse.mylar.internal.trac.core.TracException;
import org.eclipse.mylar.internal.trac.core.TracLoginException;
import org.eclipse.mylar.internal.trac.core.ITracClient.Version;
import org.eclipse.mylar.tasks.core.RepositoryTemplate;
-import org.eclipse.mylar.tasks.ui.AbstractRepositoryUi;
+import org.eclipse.mylar.tasks.ui.AbstractRepositoryConnectorUi;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
@@ -59,7 +59,7 @@ public class TracRepositorySettingsPage extends AbstractRepositorySettingsPage {
/** Supported access types. */
private Version[] versions;
- public TracRepositorySettingsPage(AbstractRepositoryUi repositoryUi) {
+ public TracRepositorySettingsPage(AbstractRepositoryConnectorUi repositoryUi) {
super(TITLE, DESCRIPTION, repositoryUi);
setNeedsAnonymousLogin(true);

Back to the top