Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorConfigurationTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskFromSelectionActionTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskWizardRepositorySelectionTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/PersonProposalProviderTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RefactorRepositoryUrlOperationTest.java8
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositorySettingsPageTest.java12
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityManagerTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskAttachmentTest.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java18
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListExternalizationTest.java20
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java8
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryFilterTests.java12
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java14
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java6
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java14
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryQuery.java4
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/core/TaskListUnmatchedContainerTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java2
-rw-r--r--org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/TaskUrlHyperlinkDetectorTest.java6
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java4
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java2
-rw-r--r--org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java2
-rw-r--r--org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracXmlRpcClientTest.java7
25 files changed, 79 insertions, 84 deletions
diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorConfigurationTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorConfigurationTest.java
index fb98e1e96..ba8eb67cc 100644
--- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorConfigurationTest.java
+++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/core/BugzillaRepositoryConnectorConfigurationTest.java
@@ -23,7 +23,7 @@ import org.eclipse.mylyn.tests.util.TestUtil.PrivilegeLevel;
/**
* @author Frank Becker
*/
-// TODO 3.4 merge into BugzillaRepositoryConnectorStandaloneTest when Bugzilla 3.6 is released
+// TODO 3.5 merge into BugzillaRepositoryConnectorStandaloneTest when Bugzilla 3.6 is released
public class BugzillaRepositoryConnectorConfigurationTest extends TestCase {
private TaskRepository repository;
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskFromSelectionActionTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskFromSelectionActionTest.java
index cd798a48c..b6de06e91 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskFromSelectionActionTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskFromSelectionActionTest.java
@@ -40,7 +40,7 @@ public class NewTaskFromSelectionActionTest extends TestCase {
// }
public void testComment() throws Exception {
- TaskRepository taskRepository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository taskRepository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
TaskData taskData = new TaskData(new TaskAttributeMapper(taskRepository), "kind", "http://url", "1");
TaskComment comment = new TaskComment(taskRepository, new MockTask("1"), taskData.getRoot().createAttribute(
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskWizardRepositorySelectionTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskWizardRepositorySelectionTest.java
index 249e89621..1c9fddeca 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskWizardRepositorySelectionTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/NewTaskWizardRepositorySelectionTest.java
@@ -37,7 +37,7 @@ public class NewTaskWizardRepositorySelectionTest extends TestCase {
// see bug 203801
public void testRepositorySettingWithTaskListSelection() {
- TaskRepository mockRepository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository mockRepository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
TasksUiPlugin.getRepositoryManager().addRepository(mockRepository);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/PersonProposalProviderTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/PersonProposalProviderTest.java
index 417ef2247..e8c00922c 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/PersonProposalProviderTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/PersonProposalProviderTest.java
@@ -174,7 +174,7 @@ public class PersonProposalProviderTest extends TestCase {
MockTask task1 = new MockTask(MockRepositoryConnector.REPOSITORY_URL, "1");
task1.setOwner("foo");
PersonProposalProvider provider = new PersonProposalProvider(MockRepositoryConnector.REPOSITORY_URL,
- MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector.CONNECTOR_KIND);
MockRepositoryQuery query = new MockRepositoryQuery("summary");
TasksUiPlugin.getTaskList().addQuery(query);
TasksUiPlugin.getTaskList().addTask(task1, query);
@@ -196,7 +196,7 @@ public class PersonProposalProviderTest extends TestCase {
TasksUi.getRepositoryManager().addRepository(repository);
PersonProposalProvider provider = new PersonProposalProvider(MockRepositoryConnector.REPOSITORY_URL,
- MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector.CONNECTOR_KIND);
IContentProposal[] result = provider.getProposals("user", 1);
assertNotNull(result);
assertEquals(1, result.length);
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RefactorRepositoryUrlOperationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RefactorRepositoryUrlOperationTest.java
index 5394c765c..3af27047d 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RefactorRepositoryUrlOperationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RefactorRepositoryUrlOperationTest.java
@@ -93,9 +93,9 @@ public class RefactorRepositoryUrlOperationTest extends TestCase {
taskList.addTask(task);
taskList.addTask(task2);
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://a");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://a");
TasksUi.getRepositoryManager().addRepository(repository);
- TaskRepository repository2 = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://other");
+ TaskRepository repository2 = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://other");
TasksUi.getRepositoryManager().addRepository(repository2);
try {
@@ -177,12 +177,12 @@ public class RefactorRepositoryUrlOperationTest extends TestCase {
}
public void testMigrateTaskHandlesUnsubmittedTask() throws Exception {
- ITask task = TasksUiUtil.createOutgoingNewTask(MockRepositoryConnector.REPOSITORY_KIND, "http://a");
+ ITask task = TasksUiUtil.createOutgoingNewTask(MockRepositoryConnector.CONNECTOR_KIND, "http://a");
String handleIdentifier = task.getHandleIdentifier();
taskList.addTask(task);
assertEquals("http://a", task.getAttribute(ITasksCoreConstants.ATTRIBUTE_OUTGOING_NEW_REPOSITORY_URL));
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://a");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://a");
TasksUi.getRepositoryManager().addRepository(repository);
try {
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 cfafbd166..bbdef57f5 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
@@ -33,7 +33,7 @@ import org.eclipse.ui.PlatformUI;
public class RepositorySettingsPageTest extends TestCase {
public void testNeedsEncoding() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://localhost/");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://localhost/");
repository.setCharacterEncoding("UTF-8");
MockRepositorySettingsPage page = new MockRepositorySettingsPage(repository);
@@ -88,7 +88,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testNeedsAnonyoumousLogin() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://localhost/");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://localhost/");
TasksUiPlugin.getDefault().addRepositoryConnectorUi(new MockRepositoryConnectorUi());
@@ -134,7 +134,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testSavePassword() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://localhost/");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://localhost/");
TasksUiPlugin.getDefault().addRepositoryConnectorUi(new MockRepositoryConnectorUi());
assertTrue(repository.getSavePassword(AuthenticationType.REPOSITORY));
@@ -160,7 +160,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testSaveHttpPassword() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://localhost/");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://localhost/");
TasksUiPlugin.getDefault().addRepositoryConnectorUi(new MockRepositoryConnectorUi());
assertTrue(repository.getSavePassword(AuthenticationType.HTTP));
@@ -188,7 +188,7 @@ public class RepositorySettingsPageTest extends TestCase {
}
public void testSaveProxyPassword() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://localhost/");
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://localhost/");
TasksUiPlugin.getDefault().addRepositoryConnectorUi(new MockRepositoryConnectorUi());
assertTrue(repository.getSavePassword(AuthenticationType.PROXY));
@@ -261,7 +261,7 @@ public class RepositorySettingsPageTest extends TestCase {
@Override
public String getConnectorKind() {
- return MockRepositoryConnector.REPOSITORY_KIND;
+ return MockRepositoryConnector.CONNECTOR_KIND;
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java
index e6aa8e17f..6e55a0f70 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTemplateManagerTest.java
@@ -35,12 +35,12 @@ public class RepositoryTemplateManagerTest extends TestCase {
RepositoryTemplate template = new RepositoryTemplate("Mock", MockRepositoryConnector.REPOSITORY_URL, "", "",
"", "", "", "", false, true);
try {
- manager.addTemplate(MockRepositoryConnector.REPOSITORY_KIND, template);
+ manager.addTemplate(MockRepositoryConnector.CONNECTOR_KIND, template);
assertFalse(TaskRepositoryUtil.isAddAutomaticallyDisabled(MockRepositoryConnector.REPOSITORY_URL));
TaskRepositoryUtil.disableAddAutomatically(MockRepositoryConnector.REPOSITORY_URL);
assertTrue(TaskRepositoryUtil.isAddAutomaticallyDisabled(MockRepositoryConnector.REPOSITORY_URL));
} finally {
- manager.removeTemplate(MockRepositoryConnector.REPOSITORY_KIND, template);
+ manager.removeTemplate(MockRepositoryConnector.CONNECTOR_KIND, template);
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityManagerTest.java
index 7f089783f..7829dd2cc 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskActivityManagerTest.java
@@ -96,7 +96,7 @@ public class TaskActivityManagerTest extends TestCase {
TaskTestUtil.resetTaskListAndRepositories();
- repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL);
+ repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL);
TasksUiPlugin.getRepositoryManager().addRepository(repository);
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskAttachmentTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskAttachmentTest.java
index 284189629..16da246f6 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskAttachmentTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskAttachmentTest.java
@@ -57,7 +57,7 @@ public class TaskAttachmentTest extends TestCase {
manager = TasksUiPlugin.getRepositoryManager();
- repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL);
+ repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL);
manager.addRepository(repository);
attachmentHandler = new MockAttachmentHandler();
@@ -66,7 +66,7 @@ public class TaskAttachmentTest extends TestCase {
connector.setTaskAttachmentHandler(attachmentHandler);
manager.addRepositoryConnector(connector);
- TaskData taskData = new TaskData(new TaskAttributeMapper(repository), MockRepositoryConnector.REPOSITORY_KIND,
+ TaskData taskData = new TaskData(new TaskAttributeMapper(repository), MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, "1");
attachment = new TaskAttachment(repository, new MockTask("1"), taskData.getRoot().createAttribute("attachment"));
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java
index 3e41040af..2ba2bb329 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataStoreTest.java
@@ -52,7 +52,7 @@ public class TaskDataStoreTest extends TestCase {
protected void setUp() throws Exception {
TaskRepositoryManager taskRepositoryManager = new TaskRepositoryManager();
storage = new TaskDataStore(taskRepositoryManager);
- taskRepository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ taskRepository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
file = File.createTempFile("mylyn", null);
file.deleteOnExit();
@@ -67,10 +67,10 @@ public class TaskDataStoreTest extends TestCase {
}
public void testPutAndGet() throws Exception {
- TaskDataState state = new TaskDataState(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskDataState state = new TaskDataState(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
- TaskData data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.REPOSITORY_KIND,
+ TaskData data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
TaskMapper mapper = new TaskMapper(data, true);
mapper.getTaskData().getRoot().createAttribute("attributeKey1").setValue("attValue!");
@@ -79,7 +79,7 @@ public class TaskDataStoreTest extends TestCase {
mapper.setTaskKind("task kind");
TaskData oldData = new TaskData(new TaskAttributeMapper(taskRepository),
- MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
+ MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
state.setRepositoryData(data);
state.setLastReadData(oldData);
@@ -91,7 +91,7 @@ public class TaskDataStoreTest extends TestCase {
assertNotNull(retrieved);
TaskData newTaskData = retrieved.getRepositoryData();
assertNotNull(newTaskData);
- assertEquals(MockRepositoryConnector.REPOSITORY_KIND, newTaskData.getConnectorKind());
+ assertEquals(MockRepositoryConnector.CONNECTOR_KIND, newTaskData.getConnectorKind());
mapper = new TaskMapper(newTaskData);
assertEquals("description", mapper.getDescription());
assertEquals("summary", mapper.getSummary());
@@ -99,9 +99,9 @@ public class TaskDataStoreTest extends TestCase {
}
public void testDelete() throws Exception {
- TaskData data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.REPOSITORY_KIND,
+ TaskData data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
- TaskDataState state = new TaskDataState(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskDataState state = new TaskDataState(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
state.setRepositoryData(data);
storage.putTaskData(file, state);
@@ -111,9 +111,9 @@ public class TaskDataStoreTest extends TestCase {
}
private void setupData() {
- data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.REPOSITORY_KIND,
+ data = new TaskData(new TaskAttributeMapper(taskRepository), MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL, MOCK_ID);
- state = new TaskDataState(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL,
+ state = new TaskDataState(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL,
MOCK_ID);
state.setRepositoryData(data);
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListExternalizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListExternalizationTest.java
index bcea1b66d..07f8adb9c 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListExternalizationTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListExternalizationTest.java
@@ -59,7 +59,7 @@ public class TaskListExternalizationTest extends TestCase {
TaskTestUtil.resetTaskListAndRepositories();
- repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL);
+ repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL);
TasksUiPlugin.getRepositoryManager().addRepository(repository);
taskList = TasksUiPlugin.getTaskList();
@@ -448,7 +448,7 @@ public class TaskListExternalizationTest extends TestCase {
}
public void testDeleteQuery() {
- RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, "queryUrl");
+ RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, "queryUrl");
query.setRepositoryUrl("repositoryUrl");
TasksUiPlugin.getTaskList().addQuery(query);
@@ -460,7 +460,7 @@ public class TaskListExternalizationTest extends TestCase {
}
public void testDeleteQueryAfterRename() {
- RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, "queryUrl");
+ RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, "queryUrl");
query.setRepositoryUrl("repositoryUrl");
TasksUiPlugin.getTaskList().addQuery(query);
@@ -472,7 +472,7 @@ public class TaskListExternalizationTest extends TestCase {
}
public void testCreateQueryWithSameName() {
- RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, "queryUrl");
+ RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, "queryUrl");
query.setRepositoryUrl("repositoryUrl");
TasksUiPlugin.getTaskList().addQuery(query);
assertEquals(1, TasksUiPlugin.getTaskList().getQueries().size());
@@ -480,7 +480,7 @@ public class TaskListExternalizationTest extends TestCase {
assertEquals(query, readQuery);
try {
- query = new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, "queryUrl");
+ query = new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, "queryUrl");
query.setRepositoryUrl("repositoryUrl");
TasksUiPlugin.getTaskList().addQuery(query);
fail("Expected IllegalArgumentException");
@@ -495,7 +495,7 @@ public class TaskListExternalizationTest extends TestCase {
public void testRepositoryUrlHandles() throws Exception {
String taskId = "123";
String repositoryUrl = "http://bugs.eclipse.org";
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, repositoryUrl);
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, repositoryUrl);
TasksUiPlugin.getRepositoryManager().addRepository(repository);
ITask bugTask = new TaskTask("bugzilla", repositoryUrl, taskId);
@@ -587,7 +587,7 @@ public class TaskListExternalizationTest extends TestCase {
// make some tasks
// save them
assertEquals(0, TasksUiPlugin.getTaskList().getAllTasks().size());
- ITask task = new TaskTask(MockRepositoryConnector.REPOSITORY_KIND, "http://bugs", "1");
+ ITask task = new TaskTask(MockRepositoryConnector.CONNECTOR_KIND, "http://bugs", "1");
TasksUiPlugin.getTaskList().addTask(task);
// reload tasklist and check that they persist
@@ -596,7 +596,7 @@ public class TaskListExternalizationTest extends TestCase {
// removed/disable externalizers
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().removeRepositoryConnector(
- MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector.CONNECTOR_KIND);
// reload tasklist ensure task didn't load
TaskTestUtil.saveAndReadTasklist();
@@ -620,7 +620,7 @@ public class TaskListExternalizationTest extends TestCase {
public void testOrphanedQueries() throws Exception {
// make a query
assertEquals(0, TasksUiPlugin.getTaskList().getQueries().size());
- RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, "bugzillaQuery");
+ RepositoryQuery query = new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, "bugzillaQuery");
TasksUiPlugin.getTaskList().addQuery(query);
TasksUiPlugin.getExternalizationManager().save(true);
@@ -630,7 +630,7 @@ public class TaskListExternalizationTest extends TestCase {
// removed/disable externalizers
AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().removeRepositoryConnector(
- MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector.CONNECTOR_KIND);
// reload tasklist ensure query didn't load
TaskTestUtil.saveAndReadTasklist();
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java
index 8eb4b7c86..c63074f36 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskMapperTest.java
@@ -41,7 +41,7 @@ public class TaskMapperTest extends TestCase {
@Override
protected void setUp() throws Exception {
- taskRepository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ taskRepository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
mapper = new StubTaskAttributeMapper(taskRepository);
source = new TaskMapper(new TaskData(mapper, "kind", "http://url", "1"), true);
@@ -87,16 +87,12 @@ public class TaskMapperTest extends TestCase {
public void testCloneTaskCloneCommonAttributes() {
source.setDescription("sourceDescription");
target.setDescription("");
- // TODO 3.4 remove (bug 247595)
- //target.getTaskData().getRoot().getAttribute(TaskAttribute.DESCRIPTION).getMetaData().setReadOnly(false);
target.merge(source);
assertEquals("sourceDescription", target.getDescription());
assertEquals(null, target.getSummary());
source.setSummary("sourceSummary");
target.setSummary("");
- // TODO 3.4 remove (bug 247595)
- //target.getTaskData().getRoot().getAttribute(TaskAttribute.SUMMARY).getMetaData().setReadOnly(false);
target.merge(source);
assertEquals("sourceSummary", target.getSummary());
}
@@ -156,8 +152,6 @@ public class TaskMapperTest extends TestCase {
source.setDescription("sourceDescription");
target.setDescription("");
- // TODO 3.4 remove (bug 247595)
- //target.getTaskData().getRoot().getAttribute(TaskAttribute.DESCRIPTION).getMetaData().setReadOnly(false);
target.merge(source);
assertEquals("sourceDescription", target.getDescription());
assertEquals(null, target.getSummary());
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryFilterTests.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryFilterTests.java
index 010106543..f0cc04d1c 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryFilterTests.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryFilterTests.java
@@ -27,9 +27,9 @@ public class TaskRepositoryFilterTests extends TestCase {
public void testCanCreateTaskFilter() {
ITaskRepositoryFilter canCreateTaskFilter = ITaskRepositoryFilter.CAN_CREATE_NEW_TASK;
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
- MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.CONNECTOR_KIND);
assertFalse(canCreateTaskFilter.accept(repository, connector));
connector.setCanCreateNewTask(true);
@@ -43,9 +43,9 @@ public class TaskRepositoryFilterTests extends TestCase {
public void testCanQueryTaskFilter() {
ITaskRepositoryFilter canQueryFilter = ITaskRepositoryFilter.CAN_QUERY;
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
- MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.CONNECTOR_KIND);
assertFalse(canQueryFilter.accept(repository, connector));
repository = new TaskRepository(LocalRepositoryConnector.CONNECTOR_KIND,
@@ -65,9 +65,9 @@ public class TaskRepositoryFilterTests extends TestCase {
public void testCanCreateTaskFromKeyTaskFilter() {
ITaskRepositoryFilter canCreateTaskFromKeyFilter = ITaskRepositoryFilter.CAN_CREATE_TASK_FROM_KEY;
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
- MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.REPOSITORY_KIND);
+ MockRepositoryConnector connector = (MockRepositoryConnector) TasksUiPlugin.getConnector(MockRepositoryConnector.CONNECTOR_KIND);
assertFalse(canCreateTaskFromKeyFilter.accept(repository, connector));
// need a second mock repo
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
index 8843c68e0..8d3efaefc 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskRepositoryManagerTest.java
@@ -45,7 +45,7 @@ import org.eclipse.mylyn.tasks.tests.connector.MockTask;
*/
public class TaskRepositoryManagerTest extends TestCase {
- private static final String DEFAULT_KIND = MockRepositoryConnector.REPOSITORY_KIND;
+ private static final String DEFAULT_KIND = MockRepositoryConnector.CONNECTOR_KIND;
private static final String DEFAULT_URL = "http://eclipse.org";
@@ -126,7 +126,7 @@ public class TaskRepositoryManagerTest extends TestCase {
assertEquals("httpPassword", map.get(AUTH_HTTP_PASSWORD));
}
- // FIXME 3.4 re-enable test
+ // FIXME 3.5 re-enable test
// public void testMigrationToSecureStorage() throws Exception {
// TaskRepository repository1 = new TaskRepository("bugzilla", "http://repository1/");
//
@@ -171,7 +171,7 @@ public class TaskRepositoryManagerTest extends TestCase {
}
public void testQueryDeletion() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
manager.addRepository(repository);
@@ -304,7 +304,7 @@ public class TaskRepositoryManagerTest extends TestCase {
// causing this test to fail.
AbstractRepositoryConnector connector = new MockRepositoryConnector();
manager.addRepositoryConnector(connector);
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
"http://mylyn.eclipse.org/");
repository.setProperty("owner", "euxx");
manager.addRepository(repository);
@@ -334,13 +334,13 @@ public class TaskRepositoryManagerTest extends TestCase {
}
public void testDeletion() {
- TaskRepository repository = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
manager.addRepository(repository);
repository.setRepositoryUrl("http://newurl");
manager.removeRepository(repository);
assertNull(manager.getRepository("http://newurl"));
- assertNull(manager.getRepository(MockRepositoryConnector.REPOSITORY_KIND));
- assertEquals(Collections.emptySet(), manager.getRepositories(MockRepositoryConnector.REPOSITORY_KIND));
+ assertNull(manager.getRepository(MockRepositoryConnector.CONNECTOR_KIND));
+ assertEquals(Collections.emptySet(), manager.getRepositories(MockRepositoryConnector.CONNECTOR_KIND));
}
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
index 270dc22a8..def5ee7a6 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskTestUtil.java
@@ -88,15 +88,15 @@ public class TaskTestUtil {
}
public static TaskRepository createMockRepository() {
- return new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL);
+ return new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL);
}
public static TaskTask createMockTask(String taskId) {
- return new TaskTask(MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, taskId);
+ return new TaskTask(MockRepositoryConnector.CONNECTOR_KIND, MockRepositoryConnector.REPOSITORY_URL, taskId);
}
public static RepositoryQuery createMockQuery(String queryId) {
- return new RepositoryQuery(MockRepositoryConnector.REPOSITORY_KIND, queryId);
+ return new RepositoryQuery(MockRepositoryConnector.CONNECTOR_KIND, queryId);
}
public static TaskListView openTasksViewInActivePerspective() throws Exception {
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
index 9d3edaa2c..6e20e0d97 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryConnector.java
@@ -34,13 +34,19 @@ import org.eclipse.mylyn.tasks.ui.TasksUi;
*/
public class MockRepositoryConnector extends AbstractRepositoryConnector {
- // TODO 3.4 rename to CONNECTOR_KIND
- public static final String REPOSITORY_KIND = "mock";
+ public static final String CONNECTOR_KIND = "mock";
+
+ /**
+ * @deprecated Use {@link #CONNECTOR_KIND} instead
+ */
+ // TODO 3.5 remove
+ @Deprecated
+ public static final String REPOSITORY_KIND = CONNECTOR_KIND;
public static final String REPOSITORY_URL = "http://mockrepository.test";
public static MockRepositoryConnector getDefault() {
- return (MockRepositoryConnector) TasksUi.getRepositoryConnector(REPOSITORY_KIND);
+ return (MockRepositoryConnector) TasksUi.getRepositoryConnector(CONNECTOR_KIND);
}
private AbstractTaskAttachmentHandler attachmentHandler;
@@ -106,7 +112,7 @@ public class MockRepositoryConnector extends AbstractRepositoryConnector {
@Override
public String getConnectorKind() {
- return REPOSITORY_KIND;
+ return CONNECTOR_KIND;
}
@Override
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryQuery.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryQuery.java
index d23cf0ebb..d5b79f79a 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryQuery.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/connector/MockRepositoryQuery.java
@@ -21,13 +21,13 @@ public class MockRepositoryQuery extends RepositoryQuery {
public String MOCK_QUERY_URL = MockRepositoryConnector.REPOSITORY_URL + ".query";
public MockRepositoryQuery(String description) {
- super(MockRepositoryConnector.REPOSITORY_KIND, description);
+ super(MockRepositoryConnector.CONNECTOR_KIND, description);
super.setUrl(MOCK_QUERY_URL);
super.setRepositoryUrl(MockRepositoryConnector.REPOSITORY_URL);
}
public MockRepositoryQuery(String description, String url) {
- super(MockRepositoryConnector.REPOSITORY_KIND, description);
+ super(MockRepositoryConnector.CONNECTOR_KIND, description);
super.setUrl(url);
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/core/TaskListUnmatchedContainerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/core/TaskListUnmatchedContainerTest.java
index b2361a8d5..b465704c3 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/core/TaskListUnmatchedContainerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/core/TaskListUnmatchedContainerTest.java
@@ -38,7 +38,7 @@ public class TaskListUnmatchedContainerTest extends TestCase {
@Override
protected void setUp() throws Exception {
taskList = new TaskList();
- unmatchedContainer = new UnmatchedTaskContainer(MockRepositoryConnector.REPOSITORY_KIND,
+ unmatchedContainer = new UnmatchedTaskContainer(MockRepositoryConnector.CONNECTOR_KIND,
MockRepositoryConnector.REPOSITORY_URL);
taskList.addUnmatchedContainer(unmatchedContainer);
}
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java
index e116450ab..91f9654a8 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/ContextPerspectiveManagerTest.java
@@ -71,7 +71,7 @@ public class ContextPerspectiveManagerTest extends TestCase {
assertEquals(ID_PLANNING_PERSPECTIVE, getActivePerspective());
}
- // FIXME 3.4 re-enable test
+ // FIXME 3.5 re-enable test
// public void testRecreateTask() throws Exception {
// PlatformUI.getWorkbench().showPerspective(ID_RESOURCE_PERSPECTIVE, MonitorUi.getLaunchingWorkbenchWindow());
// TaskTask task = TaskTestUtil.createMockTask("1");
diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/TaskUrlHyperlinkDetectorTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/TaskUrlHyperlinkDetectorTest.java
index 4a1342244..f16dec808 100644
--- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/TaskUrlHyperlinkDetectorTest.java
+++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/ui/editor/TaskUrlHyperlinkDetectorTest.java
@@ -186,7 +186,7 @@ public class TaskUrlHyperlinkDetectorTest extends TestCase {
*/
public void testDetectionNoRepositoryRepositoryUrl() {
repository = null;
- TaskRepository repository1 = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository1 = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
"http://repo1.test/foo");
try {
TasksUi.getRepositoryManager().addRepository(repository1);
@@ -206,9 +206,9 @@ public class TaskUrlHyperlinkDetectorTest extends TestCase {
*/
public void testDetectionNoRepositoryMultipleRepositoryUrls() {
repository = null;
- TaskRepository repository1 = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND,
+ TaskRepository repository1 = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND,
"http://repo1.test/foo");
- TaskRepository repository2 = new TaskRepository(MockRepositoryConnector.REPOSITORY_KIND, "http://repo2.test");
+ TaskRepository repository2 = new TaskRepository(MockRepositoryConnector.CONNECTOR_KIND, "http://repo2.test");
try {
TasksUi.getRepositoryManager().addRepository(repository1);
TasksUi.getRepositoryManager().addRepository(repository2);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
index 5f32d60d6..5f1ecc91e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/PersonProposalProvider.java
@@ -176,7 +176,7 @@ public class PersonProposalProvider implements IContentProposalProvider {
addAddress(task.getOwner(), addressSet);
}
- // TODO 3.4 re-implement
+ // TODO 3.5 re-implement
private void addAddresses(TaskData data, Set<String> addressSet) {
// addressSet.add(data.getAssignedTo()); // owner
// addAddress(data.getReporter(), addressSet); // ??
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
index 6cd3e29c4..598f8c078 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/BrowserPreviewViewer.java
@@ -138,7 +138,7 @@ public class BrowserPreviewViewer {
browser.getDisplay().asyncExec(new Runnable() {
public void run() {
setText(browser, job.getHtmlText());
- // TODO 3.4 error handling
+ // TODO 3.5 error handling
//getAttributeEditorManager().setMessage(null, IMessageProvider.NONE);
}
});
@@ -146,7 +146,7 @@ public class BrowserPreviewViewer {
browser.getDisplay().asyncExec(new Runnable() {
public void run() {
TasksUiInternal.displayStatus(Messages.BrowserPreviewViewer_Error, job.getStatus());
- // TODO 3.4 error handling
+ // TODO 3.5 error handling
//getAttributeEditorManager().setMessage(job.getStatus().getMessage(), IMessageProvider.ERROR);
}
});
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java
index 13e2a276a..623ff0324 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/AttachmentPreviewPage.java
@@ -183,7 +183,7 @@ public class AttachmentPreviewPage extends WizardPage {
private void createGenericPreview(Composite composite) {
Label label = new Label(composite, SWT.NONE);
label.setLayoutData(new GridData(GridData.FILL_BOTH));
- // TODO 3.4 put filename on model
+ // TODO 3.5 put filename on model
String name = model.getSource().getName();
TaskAttachmentMapper taskAttachment = TaskAttachmentMapper.createFrom(model.getAttribute());
if (taskAttachment.getFileName() != null) {
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
index 4cdbc49f8..9c234a053 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractTaskEditorPage.java
@@ -1095,7 +1095,7 @@ public abstract class AbstractTaskEditorPage extends TaskFormPage implements ISe
updateOutlinePage();
return outlinePage;
}
- // TODO 3.4 replace by getTextSupport() method
+ // TODO 3.5 replace by getTextSupport() method
if (adapter == CommonTextSupport.class) {
return textSupport;
}
diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracXmlRpcClientTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracXmlRpcClientTest.java
index b710ae6a2..650fa014c 100644
--- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracXmlRpcClientTest.java
+++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/client/TracXmlRpcClientTest.java
@@ -29,11 +29,11 @@ import org.eclipse.mylyn.internal.trac.core.client.TracXmlRpcClient;
import org.eclipse.mylyn.internal.trac.core.model.TracAction;
import org.eclipse.mylyn.internal.trac.core.model.TracSearch;
import org.eclipse.mylyn.internal.trac.core.model.TracTicket;
-import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
import org.eclipse.mylyn.internal.trac.core.model.TracTicketField;
import org.eclipse.mylyn.internal.trac.core.model.TracVersion;
import org.eclipse.mylyn.internal.trac.core.model.TracWikiPage;
import org.eclipse.mylyn.internal.trac.core.model.TracWikiPageInfo;
+import org.eclipse.mylyn.internal.trac.core.model.TracTicket.Key;
import org.eclipse.mylyn.trac.tests.support.TracFixture;
import org.eclipse.mylyn.trac.tests.support.TracTestConstants;
import org.eclipse.mylyn.trac.tests.support.TracTestUtil;
@@ -342,11 +342,6 @@ public class TracXmlRpcClientTest extends TestCase {
}
public void testGetRecentWikiChanges() throws Exception {
- // FIXME 3.4 re-enable for trunk
- if (TracFixture.current() == TracFixture.TRAC_TRUNK_XML_RPC) {
- return;
- }
-
TracWikiPageInfo[] changes = ((TracXmlRpcClient) client).getRecentWikiChanges(new Date(0), null);
TracWikiPageInfo testPage = null;
for (TracWikiPageInfo item : changes) {

Back to the top