From 393921ed540ab62420a4e4048ccd903bc74ca0e9 Mon Sep 17 00:00:00 2001 From: mkersten Date: Sat, 23 Jun 2007 02:51:08 +0000 Subject: NEW - bug 193842: [api] review Mylyn 2.0 APIs https://bugs.eclipse.org/bugs/show_bug.cgi?id=193842 --- .../mylyn/bugzilla/tests/AbstractBugzillaTest.java | 3 +- .../tests/BugzillaRepositoryConnectorTest.java | 56 +++++++++++----------- .../bugzilla/tests/BugzillaSearchEngineTest.java | 4 +- .../bugzilla/tests/DuplicateDetetionTest.java | 27 ++++------- .../eclipse/mylyn/bugzilla/tests/EncodingTest.java | 2 +- .../mylyn/bugzilla/tests/TaskEditorTest.java | 3 +- .../tests/TaskListNotificationManagerTest.java | 8 ++-- .../bugzilla/tests/headless/BugzillaQueryTest.java | 1 + .../bugzilla/ui/editor/BugzillaTaskEditor.java | 6 --- .../bugzilla/ui/tasklist/BugzillaConnectorUi.java | 2 +- .../ui/tasklist/BugzillaTaskListFactory.java | 1 - .../tasks/core/AbstractRepositoryConnector.java | 9 ---- .../src/org/eclipse/mylyn/tasks/core/TaskList.java | 21 ++------ .../mylyn/tasks/core/TaskRepositoryManager.java | 15 +++--- .../tests/RepositoryTaskSynchronizationTest.java | 30 ++++++------ .../mylyn/tasks/tests/TaskDataManagerTest.java | 2 +- .../mylyn/tasks/tests/TaskListManagerTest.java | 21 ++++---- .../internal/tasks/ui/AddExistingTaskJob.java | 3 +- .../internal/tasks/ui/OpenRepositoryTaskJob.java | 2 +- .../tasks/ui/RepositorySynchronizationManager.java | 36 +++++--------- .../mylyn/internal/tasks/ui/TaskFactory.java | 2 +- .../tasks/ui/util/DelegatingTaskExternalizer.java | 2 +- .../tasks/ui/views/AbstractFilteredTree.java | 1 - .../tasks/ui/views/TaskListDropAdapter.java | 2 +- .../ui/wizards/ContextRetrieveWizardPage.java | 2 +- .../ui/workingsets/TaskWorkingSetUpdater.java | 1 - .../eclipse/mylyn/tasks/ui/TaskListManager.java | 8 ++-- .../org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java | 11 ++--- .../org/eclipse/mylyn/tasks/ui/TasksUiUtil.java | 2 +- .../ui/editors/AbstractRepositoryTaskEditor.java | 2 +- .../editors/AbstractRepositoryTaskEditorInput.java | 6 +-- .../eclipse/mylyn/tasks/ui/editors/TaskEditor.java | 1 - .../trac/tests/TracAttachmentHandlerTest.java | 4 +- .../trac/tests/TracRepositoryConnectorTest.java | 1 + .../mylyn/trac/tests/TracTaskDataHandlerTest.java | 2 +- .../internal/trac/ui/TracTaskListFactory.java | 1 - 36 files changed, 118 insertions(+), 182 deletions(-) diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java index 475e60fca..f73831cb8 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/AbstractBugzillaTest.java @@ -60,7 +60,7 @@ public abstract class AbstractBugzillaTest extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); manager = TasksUiPlugin.getRepositoryManager(); TasksUiPlugin.getTaskListManager().getTaskList().reset(); manager.clearRepositories(TasksUiPlugin.getDefault().getRepositoriesFilePath()); @@ -89,6 +89,7 @@ public abstract class AbstractBugzillaTest extends TestCase { init(IBugzillaConstants.TEST_BUGZILLA_218_URL); } + @SuppressWarnings("deprecation") protected void init(String url) { repository = new TaskRepository(DEFAULT_KIND, url); Credentials credentials = TestUtil.readCredentials(); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java index 7dd4e3b2c..fc19a368a 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaRepositoryConnectorTest.java @@ -49,7 +49,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { public void testFocedQuerySynchronization() throws CoreException { init222(); TasksUiPlugin.getSynchronizationManager().setForceSyncExec(true); - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); assertEquals(0, taskList.getAllTasks().size()); BugzillaRepositoryQuery bugQuery = new BugzillaRepositoryQuery( IBugzillaConstants.TEST_BUGZILLA_222_URL, @@ -62,13 +62,13 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { assertEquals(1, bugQuery.getChildren().size()); AbstractTask hit = (AbstractTask) bugQuery.getChildren().toArray()[0]; - assertTrue(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(hit.getRepositoryUrl(), hit.getTaskId()) != null); - TasksUiPlugin.getDefault().getTaskDataManager().remove(hit.getRepositoryUrl(), hit.getTaskId()); + assertTrue(TasksUiPlugin.getTaskDataManager().getNewTaskData(hit.getRepositoryUrl(), hit.getTaskId()) != null); + TasksUiPlugin.getTaskDataManager().remove(hit.getRepositoryUrl(), hit.getTaskId()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, bugQuery, null, true); assertEquals(1, bugQuery.getChildren().size()); hit = (AbstractTask) bugQuery.getChildren().toArray()[0]; - assertTrue(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(hit.getRepositoryUrl(), hit.getTaskId()) != null); + assertTrue(TasksUiPlugin.getTaskDataManager().getNewTaskData(hit.getRepositoryUrl(), hit.getTaskId()) != null); } @@ -83,7 +83,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { BugzillaTask task = generateLocalTaskAndDownload("1"); assertNotNull(task); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId())); + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId())); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState()); BugzillaTask retrievedTask = (BugzillaTask) taskList.getTask(task.getHandleIdentifier()); @@ -132,7 +132,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { public void testUpdate() throws Exception { init222(); String taskNumber = "3"; - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); assertEquals(0, TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks().size()); BugzillaTask task = this.generateLocalTaskAndDownload(taskNumber); assertEquals("search-match-test 2", task.getSummary()); @@ -149,7 +149,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { public void testUpdateWithSubTasks() throws Exception { init222(); String taskNumber = "23"; - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); assertEquals(0, TasksUiPlugin.getTaskListManager().getTaskList().getAllTasks().size()); BugzillaTask task = this.generateLocalTaskAndDownload(taskNumber); assertNotNull(task.getChildren()); @@ -160,7 +160,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { init218(); BugzillaTask task = this.generateLocalTaskAndDownload("3"); assertNotNull(task); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId())); + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId())); TasksUiPlugin.getTaskListManager().activateTask(task); File sourceContextFile = ContextCorePlugin.getContextManager().getFileForContext(task.getHandleIdentifier()); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState()); @@ -179,12 +179,12 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { public void testSynchronize() throws CoreException { init222(); - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); // Get the task BugzillaTask task = generateLocalTaskAndDownload("3"); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); assertNotNull(taskData); TasksUiPlugin.getTaskListManager().getTaskList().moveToContainer(task, @@ -196,7 +196,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { taskData.setNewComment(newCommentText); Set changed = new HashSet(); changed.add(taskData.getAttribute(RepositoryTaskAttribute.COMMENT_NEW)); - TasksUiPlugin.getDefault().getTaskDataManager().saveEdits(task.getRepositoryUrl(), task.getTaskId(), changed); + TasksUiPlugin.getTaskDataManager().saveEdits(task.getRepositoryUrl(), task.getTaskId(), changed); // Submit changes submit(task, taskData); @@ -204,7 +204,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); // After submit task should be in SYNCHRONIZED state assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState()); - RepositoryTaskData taskData2 = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData2 = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertFalse(taskData2.getLastModified().equals(taskData.getLastModified())); // Still not read assertFalse(taskData2.getLastModified().equals(task.getLastReadTimeStamp())); @@ -216,11 +216,11 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { // because task doesn't have bug report (new query hit) // Result: retrieved with no incoming status // task.setSyncState(RepositoryTaskSyncState.SYNCHRONIZED); - TasksUiPlugin.getDefault().getTaskDataManager().remove(task.getRepositoryUrl(), task.getTaskId()); + TasksUiPlugin.getTaskDataManager().remove(task.getRepositoryUrl(), task.getTaskId()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, false, null); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState()); RepositoryTaskData bugReport2 = null; - bugReport2 = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + bugReport2 = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertNotNull(bugReport2); assertEquals(task.getTaskId(), bugReport2.getId()); @@ -265,7 +265,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { init222(); String taskNumber = "33"; BugzillaTask task = generateLocalTaskAndDownload(taskNumber); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertNotNull(task); assertNotNull(taskData); @@ -326,7 +326,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { } task = (BugzillaTask) connector.createTaskFromExistingId(repository, taskNumber, new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(numAttached, taskData.getAttachments().size()); /* Test uploading a proper file */ @@ -344,7 +344,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { task = (BugzillaTask) connector.createTaskFromExistingId(repository, taskNumber, new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(numAttached + 1, taskData.getAttachments().size()); // use assertion to track clean-up @@ -356,14 +356,14 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { init222(); String taskID = "4"; BugzillaTask task4 = generateLocalTaskAndDownload(taskID); - RepositoryTaskData taskData4 = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task4.getRepositoryUrl(), task4.getTaskId()); + RepositoryTaskData taskData4 = TasksUiPlugin.getTaskDataManager().getEditableCopy(task4.getRepositoryUrl(), task4.getTaskId()); assertNotNull(task4); assertNotNull(taskData4); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task4.getSynchronizationState()); assertEquals(taskID, taskData4.getId()); BugzillaTask task5 = generateLocalTaskAndDownload("5"); - RepositoryTaskData taskData5 = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task5.getRepositoryUrl(), task5.getTaskId()); + RepositoryTaskData taskData5 = TasksUiPlugin.getTaskDataManager().getEditableCopy(task5.getRepositoryUrl(), task5.getTaskId()); assertNotNull(task5); assertNotNull(taskData5); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task5.getSynchronizationState()); @@ -431,7 +431,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { init222(); BugzillaTask task7 = generateLocalTaskAndDownload("7"); - RepositoryTaskData recentTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task7.getRepositoryUrl(), task7.getTaskId()); + RepositoryTaskData recentTaskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task7.getRepositoryUrl(), task7.getTaskId()); assertNotNull(recentTaskData); TasksUiPlugin.getSynchronizationManager().setTaskRead(task7, true); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task7.getSynchronizationState()); @@ -443,10 +443,10 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { TasksUiPlugin.getRepositoryManager().setSynchronizationTime(repository, task7.getLastReadTimeStamp(), TasksUiPlugin.getDefault().getRepositoriesFilePath()); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(IBugzillaConstants.TEST_BUGZILLA_222_URL, "7")); - TasksUiPlugin.getDefault().getTaskDataManager().remove(task7.getRepositoryUrl(), task7.getTaskId()); + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(IBugzillaConstants.TEST_BUGZILLA_222_URL, "7")); + TasksUiPlugin.getTaskDataManager().remove(task7.getRepositoryUrl(), task7.getTaskId()); - assertNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(IBugzillaConstants.TEST_BUGZILLA_222_URL, "7")); + assertNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(IBugzillaConstants.TEST_BUGZILLA_222_URL, "7")); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, task7.getSynchronizationState()); assertNotNull(task7.getLastReadTimeStamp()); @@ -464,7 +464,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { recentTaskData.setAttributeValue(BugzillaReportElement.PRIORITY.getKeyString(), priority); } // REMOVE ALL TASK DATA - TasksUiPlugin.getDefault().getTaskDataManager().clear(); + TasksUiPlugin.getTaskDataManager().clear(); connector.getTaskDataHandler().postTaskData(repository, recentTaskData, new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronizeChanged(connector, repository); assertEquals(RepositoryTaskSyncState.INCOMING, task7.getSynchronizationState()); @@ -498,7 +498,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { */ protected void timeTracker(int taskid, boolean enableDeadline) throws Exception { BugzillaTask bugtask = generateLocalTaskAndDownload("" + taskid); - RepositoryTaskData bugtaskdata = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(bugtask.getRepositoryUrl(), bugtask.getTaskId()); + RepositoryTaskData bugtaskdata = TasksUiPlugin.getTaskDataManager().getNewTaskData(bugtask.getRepositoryUrl(), bugtask.getTaskId()); assertNotNull(bugtaskdata); assertEquals(taskid + "", bugtaskdata.getId()); assertEquals(RepositoryTaskSyncState.SYNCHRONIZED, bugtask.getSynchronizationState()); @@ -542,7 +542,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { bugtaskdata.setAttributeValue(BugzillaReportElement.DEADLINE.getKeyString(), deadline); // for (AbstractTask task : tasks) { -// RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( +// RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( // task.getHandleIdentifier()); bugtaskdata.setAttributeValue(BugzillaReportElement.ADD_COMMENT.getKeyString(), "New Estimate: " + estimatedTime + "\nNew Remaining: " + remainingTime + "\nAdd: " + addTime); @@ -551,7 +551,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { synchAndAssertState(tasks, RepositoryTaskSyncState.SYNCHRONIZED); - bugtaskdata = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(bugtask.getRepositoryUrl(), bugtask.getTaskId()); + bugtaskdata = TasksUiPlugin.getTaskDataManager().getNewTaskData(bugtask.getRepositoryUrl(), bugtask.getTaskId()); assertEquals(estimatedTime, Float.parseFloat(bugtaskdata.getAttributeValue(BugzillaReportElement.ESTIMATED_TIME.getKeyString()))); @@ -588,7 +588,7 @@ public class BugzillaRepositoryConnectorTest extends AbstractBugzillaTest { boolean isPatch[] = { false, true, false, false, false, false, false, true, false, false }; boolean isObsolete[] = { false, true, false, true, false, false, false, false, false, false }; - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( task.getRepositoryUrl(), task.getTaskId()); Iterator iter = taskData.getAttachments().iterator(); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java index 90dbb83f8..b8d437122 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/BugzillaSearchEngineTest.java @@ -23,7 +23,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskFactory; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.QueryHitCollector; -import org.eclipse.mylyn.tasks.core.TaskList; import org.eclipse.mylyn.tasks.core.TaskRepository; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -104,6 +103,7 @@ public class BugzillaSearchEngineTest extends TestCase { assertEquals(NUM_EXPECTED_HITS, hits.size()); } + @SuppressWarnings("deprecation") private Set runQuery(String repositoryURL, String SearchString) throws Exception { TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository( BugzillaCorePlugin.REPOSITORY_KIND, repositoryURL); @@ -115,7 +115,7 @@ public class BugzillaSearchEngineTest extends TestCase { AbstractRepositoryConnector connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector( BugzillaCorePlugin.REPOSITORY_KIND); - TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); +// TaskList taskList = TasksUiPlugin.getTaskListManager().getTaskList(); QueryHitCollector collector = new QueryHitCollector(new TaskFactory(repository)); connector.performQuery(repositoryQuery, repository, new NullProgressMonitor(), collector); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java index ec58a0dd6..c1d825c3c 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/DuplicateDetetionTest.java @@ -45,8 +45,7 @@ public class DuplicateDetetionTest extends TestCase { String stackTrace = "java.lang.NullPointerException\nat jeff.testing.stack.trace.functionality(jeff.java:481)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); @@ -63,8 +62,7 @@ public class DuplicateDetetionTest extends TestCase { public void testNoStackTrace() throws Exception { String fakeStackTrace = "this is not really a stacktrace"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(fakeStackTrace); model.setNew(true); IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); @@ -84,8 +82,7 @@ public class DuplicateDetetionTest extends TestCase { String stackTrace = "java.lang.NullPointerException\nat jeff.testing.stack.trace.functionality(jeff.java:481)"; String extraText = "\nExtra text that isnt' part of the stack trace java:"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(extraText + "\n" + stackTrace + "\n"); model.setNew(true); @@ -114,8 +111,7 @@ public class DuplicateDetetionTest extends TestCase { "(JarURLConnection.java:124)\n" + "at org.eclipse.jdt.internal.core.JavaElement\n.getURLContents(JavaElement.java:734)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); @@ -143,8 +139,7 @@ public class DuplicateDetetionTest extends TestCase { " at sun.net.www.protocol.jar.JarURLConnection.getInputStream(JarURLConnection.java:124)\n" + " at org.eclipse.jdt.internal.core.JavaElement.getURLContents(JavaElement.java:734)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); @@ -168,8 +163,7 @@ public class DuplicateDetetionTest extends TestCase { " at gnu.java.lang.MainThread.call_main() (/usr/lib/libgcj.so.6.0.0)\n" + " at gnu.java.lang.MainThread.run() (/usr/lib/libgcj.so.6.0.0)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); @@ -192,8 +186,7 @@ public class DuplicateDetetionTest extends TestCase { " at testcase.main (testcase.java)\n" + " at java.lang.reflect.Method.Invoke (Method.java)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); @@ -218,8 +211,7 @@ public class DuplicateDetetionTest extends TestCase { " at java/util/Properties.load(Properties.java:192)\n" + " at java/util/logging/LogManager.readConfiguration(L:555)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); @@ -243,8 +235,7 @@ public class DuplicateDetetionTest extends TestCase { " at java.lang.VirtualMachine.invokeMain (VirtualMachine.java)\n" + " at java.lang.VirtualMachine.main (VirtualMachine.java:108)"; - RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setDescription(stackTrace); model.setNew(true); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java index 22e65f947..c1924f814 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/EncodingTest.java @@ -67,7 +67,7 @@ public class EncodingTest extends AbstractBugzillaTest { init222(); repository.setCharacterEncoding("UTF-8"); BugzillaTask task = (BugzillaTask) connector.createTaskFromExistingId(repository, "57", new NullProgressMonitor()); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertNotNull(task); assertTrue(task.getSummary().equals("\u00E6"));//"\u05D0")); String priority = null; diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java index 098bd69ee..c4e05b69f 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskEditorTest.java @@ -57,8 +57,7 @@ public class TaskEditorTest extends TestCase { IBugzillaConstants.TEST_BUGZILLA_222_URL); RepositoryTaskData model = new RepositoryTaskData(new BugzillaAttributeFactory(), - BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getDefault() - .getTaskDataManager().getNewRepositoryTaskId()); + BugzillaCorePlugin.REPOSITORY_KIND, repository.getUrl(), TasksUiPlugin.getTaskDataManager().getNewRepositoryTaskId()); model.setNew(true); BugzillaRepositoryConnector.setupNewBugAttributes(repository, model); NewTaskEditorInput editorInput = new NewTaskEditorInput(repository, model); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java index 0dfca0666..be9d7fdf4 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/TaskListNotificationManagerTest.java @@ -57,7 +57,7 @@ public class TaskListNotificationManagerTest extends TestCase { TasksUiPlugin.getTaskListManager().getTaskList().addTask(task1); TasksUiPlugin.getTaskListManager().getTaskList().addTask(task2); - TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager(); + TaskListNotificationManager notificationManager = TasksUiPlugin.getTaskListNotificationManager(); notificationManager.collectNotifications(); task0 = TasksUiPlugin.getTaskListManager().getTaskList().getTask("local-0"); @@ -81,7 +81,7 @@ public class TaskListNotificationManagerTest extends TestCase { assertEquals( RepositoryTaskSyncState.SYNCHRONIZED, task.getSynchronizationState()); assertFalse(task.isNotified()); TasksUiPlugin.getTaskListManager().getTaskList().addTask(task); - TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager(); + TaskListNotificationManager notificationManager = TasksUiPlugin.getTaskListNotificationManager(); notificationManager.collectNotifications(); assertTrue(notificationManager.getNotifications().contains(new TaskListNotificationIncoming(task))); task = (AbstractTask) TasksUiPlugin.getTaskListManager().getTaskList().getTask( @@ -98,7 +98,7 @@ public class TaskListNotificationManagerTest extends TestCase { TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query); TasksUiPlugin.getTaskListManager().getTaskList().addTask(hit, query); - TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager(); + TaskListNotificationManager notificationManager = TasksUiPlugin.getTaskListNotificationManager(); assertFalse(hit.isNotified()); notificationManager.collectNotifications(); for (ITaskListNotification notification : notificationManager.getNotifications()) { @@ -117,7 +117,7 @@ public class TaskListNotificationManagerTest extends TestCase { "summary"); TasksUiPlugin.getTaskListManager().getTaskList().addQuery(query); TasksUiPlugin.getTaskListManager().getTaskList().addTask(hit, query); - TaskListNotificationManager notificationManager = TasksUiPlugin.getDefault().getTaskListNotificationManager(); + TaskListNotificationManager notificationManager = TasksUiPlugin.getTaskListNotificationManager(); notificationManager.collectNotifications(); for (ITaskListNotification notification : notificationManager.getNotifications()) { notification.getLabel().equals(hit.getSummary()); diff --git a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java index 1f5a3e093..2b10582e2 100644 --- a/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java +++ b/org.eclipse.mylyn.bugzilla.tests/src/org/eclipse/mylyn/bugzilla/tests/headless/BugzillaQueryTest.java @@ -126,6 +126,7 @@ public class BugzillaQueryTest extends TestCase { // taskData.getAttributeValue(BugzillaReportElement.PRIORITY.getKeyString())); // } + @SuppressWarnings("deprecation") public void testQueryViaConnector() throws Exception { String queryUrlString = repository.getUrl() + "/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=search-match-test&product=TestProduct&long_desc_type=substring&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&deadlinefrom=&deadlineto=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&emailassigned_to1=1&emailtype1=substring&email1=&emailassigned_to2=1&emailreporter2=1&emailcc2=1&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java index 8eaace14f..6e8877783 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/editor/BugzillaTaskEditor.java @@ -21,8 +21,6 @@ import java.util.StringTokenizer; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.viewers.SelectionChangedEvent; -import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaCorePlugin; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaReportElement; import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants; @@ -30,11 +28,9 @@ import org.eclipse.mylyn.internal.bugzilla.core.IBugzillaConstants.BUGZILLA_OPER import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TaskListColorsAndFonts; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; -import org.eclipse.mylyn.internal.tasks.ui.editors.RepositoryTaskSelection; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.RepositoryOperation; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; -import org.eclipse.mylyn.tasks.core.TaskComment; import org.eclipse.mylyn.tasks.ui.AbstractDuplicateDetector; import org.eclipse.mylyn.tasks.ui.DatePicker; import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; @@ -54,10 +50,8 @@ import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.layout.RowLayout; import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Event; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.List; -import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.forms.IFormColors; import org.eclipse.ui.forms.editor.FormEditor; diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java index fa125ac7b..2c696e467 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaConnectorUi.java @@ -206,7 +206,7 @@ public class BugzillaConnectorUi extends AbstractRepositoryConnectorUi { if(task instanceof BugzillaTask){ // XXX This is only used in the planning editor, and if its input was set correctly as a RepositoryTaskEditorInput // we wouldn't have to get the task data this way from here - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); if(taskData != null && taskData.getAttribute(BugzillaReportElement.ESTIMATED_TIME.getKeyString()) != null) return true; } diff --git a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java index a79b5fafd..aefb5639c 100644 --- a/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java +++ b/org.eclipse.mylyn.bugzilla.ui/src/org/eclipse/mylyn/internal/bugzilla/ui/tasklist/BugzillaTaskListFactory.java @@ -16,7 +16,6 @@ import java.util.Set; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaRepositoryQuery; import org.eclipse.mylyn.internal.bugzilla.core.BugzillaTask; -import org.eclipse.mylyn.internal.tasks.core.TaskExternalizationException; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; import org.eclipse.mylyn.tasks.core.AbstractTaskListFactory; diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java index 3f068326f..0162d9ba9 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/AbstractRepositoryConnector.java @@ -11,12 +11,7 @@ package org.eclipse.mylyn.tasks.core; -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.io.IOException; import java.util.Date; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; @@ -24,13 +19,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubProgressMonitor; -import org.eclipse.mylyn.context.core.ContextCorePlugin; -import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.core.IRepositoryConstants; import org.eclipse.mylyn.internal.tasks.core.TaskDataManager; -import org.eclipse.mylyn.tasks.core.AbstractTask.RepositoryTaskSyncState; /** * Encapsulates common operations that can be performed on a task repository. Extend to diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java index 8ec3caed9..35b06e019 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskList.java @@ -370,28 +370,15 @@ public class TaskList { } } - // private boolean deleteTaskHelper(Set tasks, ITask toDelete) { - // for (ITask task : tasks) { - // if (task.getHandleIdentifier().equals(toDelete.getHandleIdentifier())) { - // tasks.remove(task); - // return true; - // } else { - // if (deleteTaskHelper(task.getChildren(), toDelete)) - // return true; - // } - // } - // return false; - // } - - @Deprecated + /** + * For normal user operation getActiveTask() should be used instead. + */ public List getActiveTasks() { return activeTasks; } /** - * HACK: returns first - * - * @return + * @return First in set of all active tasks. Normal user operations only supports a single active task. */ public AbstractTask getActiveTask() { if (activeTasks.size() > 0) { diff --git a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java index e5606cc65..848f7c9ba 100644 --- a/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java +++ b/org.eclipse.mylyn.tasks.core/src/org/eclipse/mylyn/tasks/core/TaskRepositoryManager.java @@ -194,15 +194,12 @@ public class TaskRepositoryManager { } public TaskRepository getRepositoryForActiveTask(String repositoryKind, TaskList taskList) { - List activeTasks = taskList.getActiveTasks(); - if (activeTasks.size() == 1) { - AbstractTask activeTask = activeTasks.get(0); - if (activeTask instanceof AbstractTask) { - String repositoryUrl = ((AbstractTask) activeTask).getRepositoryUrl(); - for (TaskRepository repository : getRepositories(repositoryKind)) { - if (repository.getUrl().equals(repositoryUrl)) { - return repository; - } + AbstractTask activeTask = taskList.getActiveTask(); + if (activeTask instanceof AbstractTask) { + String repositoryUrl = ((AbstractTask) activeTask).getRepositoryUrl(); + for (TaskRepository repository : getRepositories(repositoryKind)) { + if (repository.getUrl().equals(repositoryUrl)) { + return repository; } } } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java index eff0c3627..af5156132 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/RepositoryTaskSynchronizationTest.java @@ -88,7 +88,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { // Test unforced AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.INCOMING, RepositoryTaskSyncState.INCOMING); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState()); @@ -108,7 +108,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { // olddata) assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState()); assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_3, taskData.getLastModified()); // Should keep INCOMING state state since new data has same date samp @@ -116,7 +116,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { TasksUiPlugin.getSynchronizationManager().saveIncoming(task, taskData3, false); assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState()); assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_3, taskData.getLastModified()); } @@ -188,7 +188,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, false); assertEquals(RepositoryTaskSyncState.INCOMING, task.getSynchronizationState()); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_2, taskData.getLastModified()); // assertEquals(DATE_STAMP_2, task.getLastModifiedDateStamp()); } @@ -211,7 +211,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { RepositoryTaskSyncState.SYNCHRONIZED); assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); taskData.setNewComment("new comment"); @@ -228,13 +228,13 @@ public class RepositoryTaskSynchronizationTest extends TestCase { assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true); assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState()); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_2, taskData.getLastModified()); TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true); assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState()); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_2, taskData.getLastModified()); } @@ -256,13 +256,13 @@ public class RepositoryTaskSynchronizationTest extends TestCase { // Forced AbstractTask task = primeTaskAndRepository(RepositoryTaskSyncState.OUTGOING, RepositoryTaskSyncState.INCOMING); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_1, task.getLastReadTimeStamp()); assertEquals(RepositoryTaskSyncState.OUTGOING, task.getSynchronizationState()); TasksUiPlugin.getSynchronizationManager().saveIncoming(task, newData, true); assertEquals(RepositoryTaskSyncState.CONFLICT, task.getSynchronizationState()); - taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertEquals(DATE_STAMP_2, taskData.getLastModified()); // assertEquals(DATE_STAMP_2, task.getLastModifiedDateStamp()); @@ -313,21 +313,21 @@ public class RepositoryTaskSynchronizationTest extends TestCase { RepositoryTaskSyncState.SYNCHRONIZED); RepositoryTaskData taskData1 = new RepositoryTaskData(new MockAttributeFactory(), MockRepositoryConnector.REPOSITORY_KIND, MockRepositoryConnector.REPOSITORY_URL, "1"); - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData1); - taskData1 = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); + TasksUiPlugin.getTaskDataManager().setNewTaskData(taskData1); + taskData1 = TasksUiPlugin.getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); taskData1.setNewComment("Testing"); Set edits = new HashSet(); edits.add(taskData1.getAttribute(RepositoryTaskAttribute.COMMENT_NEW)); - TasksUiPlugin.getDefault().getTaskDataManager().saveEdits(task.getRepositoryUrl(), task.getTaskId(), edits); + TasksUiPlugin.getTaskDataManager().saveEdits(task.getRepositoryUrl(), task.getTaskId(), edits); - RepositoryTaskData editedData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData editedData = TasksUiPlugin.getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); assertEquals("Testing", editedData.getNewComment()); TasksUiPlugin.getSynchronizationManager().discardOutgoing(task); assertTrue(task.getSynchronizationState().equals(RepositoryTaskSyncState.SYNCHRONIZED)); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getEditableCopy(task.getRepositoryUrl(), task.getTaskId()); assertEquals("", taskData.getNewComment()); } @@ -421,7 +421,7 @@ public class RepositoryTaskSynchronizationTest extends TestCase { taskData.setAttributeValue(RepositoryTaskAttribute.DATE_MODIFIED, DATE_STAMP_1); task.setLastReadTimeStamp(DATE_STAMP_1); task.setSynchronizationState(localState); - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(taskData); newData = new RepositoryTaskData(new MockAttributeFactory(), connector.getConnectorKind(), MockRepositoryConnector.REPOSITORY_URL, MOCCK_ID); switch (remoteState) { diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java index 48908b968..4e419c170 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskDataManagerTest.java @@ -32,7 +32,7 @@ public class TaskDataManagerTest extends TestCase { @Override protected void setUp() throws Exception { super.setUp(); - offlineTaskDataManager = TasksUiPlugin.getDefault().getTaskDataManager(); + offlineTaskDataManager = TasksUiPlugin.getTaskDataManager(); offlineTaskDataManager.clear(); offlineTaskDataManager.saveNow(); } diff --git a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java index 3d3417666..0a0eb5123 100644 --- a/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java +++ b/org.eclipse.mylyn.tasks.tests/src/org/eclipse/mylyn/tasks/tests/TaskListManagerTest.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashSet; import java.util.Iterator; @@ -190,24 +189,24 @@ public class TaskListManagerTest extends TestCase { RepositoryTaskData taskData = new RepositoryTaskData(new MockAttributeFactory(), task.getConnectorKind(), task.getRepositoryUrl(), task.getTaskId(), task.getTaskKind()); - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), + TasksUiPlugin.getTaskDataManager().setNewTaskData(taskData); + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId())); RepositoryTaskData taskData2 = new RepositoryTaskData(new MockAttributeFactory(), task2.getConnectorKind(), task2.getRepositoryUrl(), task2.getTaskId(), task2.getTaskKind()); taskData2.setNewComment("TEST"); - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData2); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task2.getRepositoryUrl(), + TasksUiPlugin.getTaskDataManager().setNewTaskData(taskData2); + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData(task2.getRepositoryUrl(), task2.getTaskId())); - assertEquals("TEST", TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task2.getRepositoryUrl(), + assertEquals("TEST", TasksUiPlugin.getTaskDataManager().getNewTaskData(task2.getRepositoryUrl(), task2.getTaskId()).getNewComment()); manager.refactorRepositoryUrl("http://a", "http://b"); assertNull(manager.getTaskList().getTask("http://a-123")); assertNotNull(manager.getTaskList().getTask("http://b-123")); - assertNotNull(TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData("http://b", "123")); - RepositoryTaskData otherData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + assertNotNull(TasksUiPlugin.getTaskDataManager().getNewTaskData("http://b", "123")); + RepositoryTaskData otherData = TasksUiPlugin.getTaskDataManager().getNewTaskData( task2.getRepositoryUrl(), task2.getTaskId()); assertNotNull(otherData); assertEquals("TEST", otherData.getNewComment()); @@ -808,13 +807,13 @@ public class TaskListManagerTest extends TestCase { TaskList taskList = manager.getTaskList(); taskList.addTask(task1); taskList.addTask(task2); - assertTrue(taskList.getActiveTasks().isEmpty()); + assertNull(taskList.getActiveTask()); manager.activateTask(task2); - assertEquals(Collections.singletonList(task2), taskList.getActiveTasks()); + assertEquals(task2, taskList.getActiveTask()); manager.deactivateAllTasks(); - assertTrue(taskList.getActiveTasks().isEmpty()); + assertNull(taskList.getActiveTask()); } public void testMarkTaskRead() { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java index 21ef3b36d..267da3da0 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/AddExistingTaskJob.java @@ -50,7 +50,6 @@ public class AddExistingTaskJob extends Job { this(repository, taskId, null); } - @Deprecated // Use TaskCategory instead public AddExistingTaskJob(TaskRepository repository, String taskId, AbstractTaskCategory taskContainer) { super(MessageFormat.format("Adding task: \"{0}\"...", taskId)); this.repository = repository; @@ -68,7 +67,7 @@ public class AddExistingTaskJob extends Job { // if (newTask instanceof AbstractTask) { // // TODO: encapsulate in abstract connector // AbstractTask repositoryTask = (AbstractTask) newTask; -// TasksUiPlugin.getDefault().getTaskDataManager().push(newTask.getHandleIdentifier(), +// TasksUiPlugin.getTaskDataManager().push(newTask.getHandleIdentifier(), // repositoryTask.getTaskData()); // } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java index ed3901b44..e6c9018e8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/OpenRepositoryTaskJob.java @@ -85,7 +85,7 @@ public class OpenRepositoryTaskJob extends Job { RepositoryTaskData downloadedTaskData = null; downloadedTaskData = offlineHandler.getTaskData(repository, taskId, monitor); if (downloadedTaskData != null) { - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(downloadedTaskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(downloadedTaskData); } openEditor(repository, downloadedTaskData); } else { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java index ab0e9fcae..369e1eef8 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/RepositorySynchronizationManager.java @@ -155,7 +155,7 @@ public class RepositorySynchronizationManager { */ public synchronized void saveOutgoing(AbstractTask repositoryTask, Set modifiedAttributes) { repositoryTask.setSynchronizationState(RepositoryTaskSyncState.OUTGOING); - TasksUiPlugin.getDefault().getTaskDataManager().saveEdits(repositoryTask.getRepositoryUrl(), + TasksUiPlugin.getTaskDataManager().saveEdits(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId(), Collections.unmodifiableSet(modifiedAttributes)); TasksUiPlugin.getTaskListManager().getTaskList().notifyTaskChanged(repositoryTask, false); } @@ -176,22 +176,22 @@ public class RepositorySynchronizationManager { return false; } - RepositoryTaskData previousTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData previousTaskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); if (repositoryTask.isSubmitting()) { status = RepositoryTaskSyncState.SYNCHRONIZED; repositoryTask.setSubmitting(false); - TaskDataManager dataManager = TasksUiPlugin.getDefault().getTaskDataManager(); + TaskDataManager dataManager = TasksUiPlugin.getTaskDataManager(); dataManager.discardEdits(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(newTaskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(newTaskData); /** * If we set both so we don't see our own changes * * @see RepositorySynchronizationManager.setTaskRead(AbstractTask, boolean) */ - // TasksUiPlugin.getDefault().getTaskDataManager().setOldTaskData(repositoryTask.getHandleIdentifier(), + // TasksUiPlugin.getTaskDataManager().setOldTaskData(repositoryTask.getHandleIdentifier(), // newTaskData); } else { @@ -200,7 +200,7 @@ public class RepositorySynchronizationManager { if (checkHasIncoming(repositoryTask, newTaskData)) { status = RepositoryTaskSyncState.CONFLICT; } - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(newTaskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(newTaskData); break; case CONFLICT: @@ -209,7 +209,7 @@ public class RepositorySynchronizationManager { // only most recent incoming will be displayed if two // sequential incoming's /conflicts happen - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(newTaskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(newTaskData); break; case SYNCHRONIZED: boolean hasIncoming = checkHasIncoming(repositoryTask, newTaskData); @@ -218,7 +218,7 @@ public class RepositorySynchronizationManager { repositoryTask.setNotified(false); } if (hasIncoming || previousTaskData == null || forceSync) { - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(newTaskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(newTaskData); } break; } @@ -228,7 +228,7 @@ public class RepositorySynchronizationManager { } public void saveOffline(AbstractTask task, RepositoryTaskData taskData) { - TasksUiPlugin.getDefault().getTaskDataManager().setNewTaskData(taskData); + TasksUiPlugin.getTaskDataManager().setNewTaskData(taskData); } /** public for testing purposes */ @@ -257,8 +257,8 @@ public class RepositorySynchronizationManager { * true to mark as read, false to mark as unread */ public void setTaskRead(AbstractTask repositoryTask, boolean read) { - TaskDataManager dataManager = TasksUiPlugin.getDefault().getTaskDataManager(); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + TaskDataManager dataManager = TasksUiPlugin.getTaskDataManager(); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); if (read && repositoryTask.getSynchronizationState().equals(RepositoryTaskSyncState.INCOMING)) { @@ -304,7 +304,7 @@ public class RepositorySynchronizationManager { } public void discardOutgoing(AbstractTask repositoryTask) { - TaskDataManager dataManager = TasksUiPlugin.getDefault().getTaskDataManager(); + TaskDataManager dataManager = TasksUiPlugin.getTaskDataManager(); dataManager.discardEdits(repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); repositoryTask.setSynchronizationState(RepositoryTaskSyncState.SYNCHRONIZED); @@ -352,16 +352,4 @@ public class RepositorySynchronizationManager { return repository; } } - - // public void mergeIncoming(AbstractTask task) { - // RepositoryTaskData newOutgoing = - // TasksUiPlugin.getDefault().getTaskDataManager().merge( - // task.getHandleIdentifier()); - // if (newOutgoing != null) { - // this.saveOutgoingChanges(task, newOutgoing); - // task.setTaskData(newOutgoing); - // } - // - // TasksUiPlugin.getTaskListManager().getTaskList().notifyRepositoryInfoChanged(task); - // } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java index 4612fd3c2..ebd8e9223 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/TaskFactory.java @@ -49,7 +49,7 @@ public class TaskFactory implements ITaskFactory { connector = TasksUiPlugin.getRepositoryManager().getRepositoryConnector(repository.getConnectorKind()); synchManager = TasksUiPlugin.getSynchronizationManager(); taskList = TasksUiPlugin.getTaskListManager().getTaskList(); - //dataManager = TasksUiPlugin.getDefault().getTaskDataManager(); + //dataManager = TasksUiPlugin.getTaskDataManager(); dataHandler = connector.getTaskDataHandler(); } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java index b5c5345c9..5bff0a14b 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/DelegatingTaskExternalizer.java @@ -559,7 +559,7 @@ final class DelegatingTaskExternalizer { // taskDataManager.getRepositoryTaskData(task.getHandleIdentifier()); // // RepositoryTaskData data = // // - // TasksUiPlugin.getDefault().getTaskDataManager().getTaskData(task.getHandleIdentifier()); + // TasksUiPlugin.getTaskDataManager().getTaskData(task.getHandleIdentifier()); // task.setTaskData(data); // // if (data != null && data.hasLocalChanges()) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java index ab99eb680..f7145413e 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/AbstractFilteredTree.java @@ -20,7 +20,6 @@ import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.ToolBarManager; import org.eclipse.mylyn.internal.monitor.core.util.StatusManager; import org.eclipse.mylyn.internal.tasks.ui.TasksUiImages; -import org.eclipse.mylyn.tasks.ui.TasksUiPlugin; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.events.KeyEvent; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java index 5fb3c2250..d1f28f0c4 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListDropAdapter.java @@ -201,7 +201,7 @@ public class TaskListDropAdapter extends ViewerDropAdapter { // if (newTask instanceof AbstractTask) { // // TODO: encapsulate in abstract connector // AbstractTask repositoryTask = (AbstractTask) newTask; -// TasksUiPlugin.getDefault().getTaskDataManager().push( +// TasksUiPlugin.getTaskDataManager().push( // RepositoryTaskHandleUtil.getHandle(repository.getUrl(), id), // repositoryTask.getTaskData()); // } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java index cea500a87..577b610ed 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/wizards/ContextRetrieveWizardPage.java @@ -123,7 +123,7 @@ public class ContextRetrieveWizardPage extends WizardPage { Collections.sort(contextAttachments, new Comparator() { public int compare(RepositoryAttachment attachment1, RepositoryAttachment attachment2) { - RepositoryTaskData data = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData data = TasksUiPlugin.getTaskDataManager().getNewTaskData( task.getRepositoryUrl(), task.getTaskId()); AbstractAttributeFactory factory = null; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java index c7d2c440a..cdb7314c3 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/workingsets/TaskWorkingSetUpdater.java @@ -10,7 +10,6 @@ package org.eclipse.mylyn.internal.tasks.ui.workingsets; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashSet; import java.util.List; import java.util.Set; diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java index 25afbb2a3..a0deab6ac 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TaskListManager.java @@ -730,7 +730,7 @@ public class TaskListManager implements IPropertyChangeListener { } private void refactorOfflineHandles(String oldRepositoryUrl, String newRepositoryUrl) { - TaskDataManager taskDataManager = TasksUiPlugin.getDefault().getTaskDataManager(); + TaskDataManager taskDataManager = TasksUiPlugin.getTaskDataManager(); for (AbstractTask task : taskList.getAllTasks()) { if (task instanceof AbstractTask) { AbstractTask repositoryTask = (AbstractTask) task; @@ -754,13 +754,13 @@ public class TaskListManager implements IPropertyChangeListener { } } } - TasksUiPlugin.getDefault().getTaskDataManager().saveNow(); + TasksUiPlugin.getTaskDataManager().saveNow(); } public boolean readExistingOrCreateNewList() { try { if (taskListFile.exists()) { - taskListWriter.readTaskList(taskList, taskListFile, TasksUiPlugin.getDefault().getTaskDataManager()); + taskListWriter.readTaskList(taskList, taskListFile, TasksUiPlugin.getTaskDataManager()); } else { resetTaskList(); } @@ -841,8 +841,6 @@ public class TaskListManager implements IPropertyChangeListener { } public void deactivateAllTasks() { - // Make a copy to avoid modification on list being traversed; can result - // in a ConcurrentModificationException List activeTasks = taskList.getActiveTasks(); for (AbstractTask task : activeTasks) { deactivateTask(task); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java index d780b901e..c8a028c0f 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java @@ -27,7 +27,6 @@ import org.eclipse.core.resources.ISaveContext; import org.eclipse.core.resources.ISaveParticipant; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Preferences.IPropertyChangeListener; import org.eclipse.core.runtime.Preferences.PropertyChangeEvent; import org.eclipse.jface.dialogs.Dialog; @@ -59,7 +58,6 @@ import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationQueryIncoming; import org.eclipse.mylyn.internal.tasks.ui.TaskListNotificationReminder; import org.eclipse.mylyn.internal.tasks.ui.TaskListSynchronizationScheduler; import org.eclipse.mylyn.internal.tasks.ui.TasksUiPreferenceConstants; -import org.eclipse.mylyn.internal.tasks.ui.WorkspaceAwareContextStore; import org.eclipse.mylyn.internal.tasks.ui.util.TaskListSaveManager; import org.eclipse.mylyn.internal.tasks.ui.util.TaskListWriter; import org.eclipse.mylyn.internal.tasks.ui.util.TasksUiExtensionReader; @@ -69,8 +67,8 @@ import org.eclipse.mylyn.internal.tasks.ui.wizards.EditRepositoryWizard; import org.eclipse.mylyn.tasks.core.AbstractRepositoryConnector; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; import org.eclipse.mylyn.tasks.core.AbstractTask; -import org.eclipse.mylyn.tasks.core.ITaskActivityListener; import org.eclipse.mylyn.tasks.core.AbstractTaskDataHandler; +import org.eclipse.mylyn.tasks.core.ITaskActivityListener; import org.eclipse.mylyn.tasks.core.RepositoryTaskAttribute; import org.eclipse.mylyn.tasks.core.RepositoryTaskData; import org.eclipse.mylyn.tasks.core.RepositoryTemplate; @@ -84,11 +82,8 @@ import org.eclipse.mylyn.web.core.WebClientUtil; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IStartup; -import org.eclipse.ui.IWindowListener; -import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; /** @@ -833,9 +828,9 @@ public class TasksUiPlugin extends AbstractUIPlugin implements IStartup { AbstractTask repositoryTask) { TaskListNotificationIncoming notification = new TaskListNotificationIncoming(repositoryTask); - RepositoryTaskData newTaskData = getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData newTaskData = getTaskDataManager().getNewTaskData( repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); - RepositoryTaskData oldTaskData = getDefault().getTaskDataManager().getOldTaskData( + RepositoryTaskData oldTaskData = getTaskDataManager().getOldTaskData( repositoryTask.getRepositoryUrl(), repositoryTask.getTaskId()); if (newTaskData != null && oldTaskData != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java index bc64f0dec..df5e3a202 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiUtil.java @@ -230,7 +230,7 @@ public class TasksUiUtil { if (connector != null) { - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData( + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData( task.getRepositoryUrl(), task.getTaskId()); if (taskData != null) { diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java index 44573cab9..5e7daecda 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditor.java @@ -343,7 +343,7 @@ public abstract class AbstractRepositoryTaskEditor extends TaskFormPage { // updateContents(); // TasksUiPlugin.getSynchronizationManager().setTaskRead(repositoryTask, // true); - // TasksUiPlugin.getDefault().getTaskDataManager().clearIncoming( + // TasksUiPlugin.getTaskDataManager().clearIncoming( // repositoryTask.getHandleIdentifier()); } else { refreshEditor(); diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java index bdb1b3db8..05272f875 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/AbstractRepositoryTaskEditorInput.java @@ -120,8 +120,8 @@ public abstract class AbstractRepositoryTaskEditorInput implements IEditorInput } public void refreshInput() { - this.editableTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getEditableCopy(repository.getUrl(), taskId); - this.oldTaskData = TasksUiPlugin.getDefault().getTaskDataManager().getOldTaskData(repository.getUrl(), taskId); - this.oldEdits = TasksUiPlugin.getDefault().getTaskDataManager().getEdits(repository.getUrl(), taskId); + this.editableTaskData = TasksUiPlugin.getTaskDataManager().getEditableCopy(repository.getUrl(), taskId); + this.oldTaskData = TasksUiPlugin.getTaskDataManager().getOldTaskData(repository.getUrl(), taskId); + this.oldEdits = TasksUiPlugin.getTaskDataManager().getEdits(repository.getUrl(), taskId); } } diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java index f1e49d006..70dc146ce 100644 --- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java +++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/editors/TaskEditor.java @@ -15,7 +15,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; -import java.util.Set; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jface.action.IMenuListener; diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java index 4c98481e5..eb418888e 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracAttachmentHandlerTest.java @@ -99,7 +99,7 @@ public class TracAttachmentHandlerTest extends TestCase { init(url, Version.XML_RPC); TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.attachmentTicketId + "", new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertTrue(taskData.getAttachments().size() > 0); File file = File.createTempFile("attachment", null); @@ -129,7 +129,7 @@ public class TracAttachmentHandlerTest extends TestCase { init(url, Version.XML_RPC); TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.attachmentTicketId + "", new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); assertTrue(taskData.getAttachments().size() > 0); InputStream in = attachmentHandler.getAttachmentAsStream(repository,taskData.getAttachments().get(0), new NullProgressMonitor()); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java index 3981c8789..a61694703 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracRepositoryConnectorTest.java @@ -196,6 +196,7 @@ public class TracRepositoryConnectorTest extends TestCase { performQuery(TracTestConstants.TEST_TRAC_096_URL, Version.TRAC_0_9); } + @SuppressWarnings("deprecation") protected void performQuery(String url, Version version) { init(url, version); diff --git a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java index 706ec165d..9f2345008 100644 --- a/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java +++ b/org.eclipse.mylyn.trac.tests/src/org/eclipse/mylyn/trac/tests/TracTaskDataHandlerTest.java @@ -112,7 +112,7 @@ public class TracTaskDataHandlerTest extends TestCase { TracTask task = (TracTask) connector.createTaskFromExistingId(repository, data.offlineHandlerTicketId + "", new NullProgressMonitor()); TasksUiPlugin.getSynchronizationManager().synchronize(connector, task, true, null); - RepositoryTaskData taskData = TasksUiPlugin.getDefault().getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); + RepositoryTaskData taskData = TasksUiPlugin.getTaskDataManager().getNewTaskData(task.getRepositoryUrl(), task.getTaskId()); int lastModified = Integer.parseInt(taskData.getLastModified()); 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 89ff1be50..ed75f3342 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 @@ -14,7 +14,6 @@ package org.eclipse.mylyn.internal.trac.ui; import java.util.HashSet; import java.util.Set; -import org.eclipse.mylyn.internal.tasks.core.TaskExternalizationException; import org.eclipse.mylyn.internal.trac.core.TracRepositoryQuery; import org.eclipse.mylyn.internal.trac.core.TracTask; import org.eclipse.mylyn.tasks.core.AbstractRepositoryQuery; -- cgit v1.2.3