REOPENED - bug 142039: highlight bug report items changed since last viewing

https://bugs.eclipse.org/bugs/show_bug.cgi?id=142039

5 files changed, 12 insertions, 14 deletions

diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
index 8b3a9a657..bb27ced45 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/TracTaskExternalizer.java
@@ -12,7 +12,6 @@
 package org.eclipse.mylar.internal.trac.ui;
 
 import org.eclipse.mylar.context.core.MylarStatusHandler;
-import org.eclipse.mylar.internal.tasks.ui.OfflineTaskManager;
 import org.eclipse.mylar.internal.trac.core.TracQueryHit;
 import org.eclipse.mylar.internal.trac.core.TracRepositoryQuery;
 import org.eclipse.mylar.internal.trac.core.TracTask;
@@ -27,6 +26,7 @@ import org.eclipse.mylar.tasks.core.RepositoryTaskData;
 import org.eclipse.mylar.tasks.core.TaskExternalizationException;
 import org.eclipse.mylar.tasks.core.TaskList;
 import org.eclipse.mylar.tasks.core.AbstractRepositoryTask.RepositoryTaskSyncState;
+import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -97,10 +97,8 @@ public class TracTaskExternalizer extends DelegatingTaskExternalizer {
 	// TODO move to DelegatingTaskExternalizer
 	@Override
 	public void readTaskData(AbstractRepositoryTask task) {
-		RepositoryTaskData data = OfflineTaskManager.findBug(task.getRepositoryUrl(), AbstractRepositoryTask
-				.getTaskId(task.getHandleIdentifier()));
-		task.setTaskData((RepositoryTaskData) data);
-
+		RepositoryTaskData data = TasksUiPlugin.getDefault().getTaskDataManager().getTaskData(task.getHandleIdentifier());		
+		task.setTaskData(data);
 		if (data != null && data.hasLocalChanges()) {
 			task.setSyncState(RepositoryTaskSyncState.OUTGOING);
 		}
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
index 64c2d0b9f..2f17b7271 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/NewTracTaskEditor.java
@@ -65,6 +65,8 @@ public class NewTracTaskEditor extends AbstractNewRepositoryTaskEditor {
 			return;
 		}
 
+		final AbstractTaskContainer category = getCategory();
+		
 		Job submitJob = new Job(SUBMIT_JOB_LABEL) {
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {
@@ -74,8 +76,7 @@ public class NewTracTaskEditor extends AbstractNewRepositoryTaskEditor {
 
 					TracTask newTask = new TracTask(AbstractRepositoryTask.getHandle(repository.getUrl(), id),
 							TracRepositoryConnector.getTicketDescription(ticket), true);
-
-					AbstractTaskContainer category = getCategory();
+					
 					if (category != null) {
 						TasksUiPlugin.getTaskListManager().getTaskList().addTask(newTask, category);
 					} else {
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
index f0064736e..9a8a5f516 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditor.java
@@ -62,7 +62,7 @@ public class TracTaskEditor extends AbstractRepositoryTaskEditor {
 		setSite(site);
 		setInput(input);
 
-		taskOutlineModel = RepositoryTaskOutlineNode.parseBugReport(editorInput.getRepositoryTaskData());
+		taskOutlineModel = RepositoryTaskOutlineNode.parseBugReport(editorInput.getTaskData());
 
 		isDirty = false;
 		updateEditorTitle();
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
index 6243e4c64..ec66a1699 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/editor/TracTaskEditorFactory.java
@@ -9,14 +9,13 @@ package org.eclipse.mylar.internal.trac.ui.editor;
 
 import org.eclipse.mylar.context.core.MylarStatusHandler;
 import org.eclipse.mylar.internal.tasks.ui.ITaskEditorFactory;
-import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryTaskEditorInput;
 import org.eclipse.mylar.internal.tasks.ui.editors.MylarTaskEditor;
 import org.eclipse.mylar.internal.tasks.ui.editors.NewTaskEditorInput;
+import org.eclipse.mylar.internal.tasks.ui.editors.RepositoryTaskEditorInput;
 import org.eclipse.mylar.internal.tasks.ui.editors.TaskEditorInput;
 import org.eclipse.mylar.internal.trac.core.TracCorePlugin;
 import org.eclipse.mylar.internal.trac.core.TracRepositoryConnector;
 import org.eclipse.mylar.internal.trac.core.TracTask;
-import org.eclipse.mylar.tasks.core.AbstractRepositoryTask;
 import org.eclipse.mylar.tasks.core.ITask;
 import org.eclipse.mylar.tasks.core.TaskRepository;
 import org.eclipse.mylar.tasks.ui.TasksUiPlugin;
@@ -40,11 +39,11 @@ public class TracTaskEditorFactory implements ITaskEditorFactory {
 	public boolean canCreateEditorFor(IEditorInput input) {
 		if (input instanceof RepositoryTaskEditorInput) {
 			RepositoryTaskEditorInput existingInput = (RepositoryTaskEditorInput) input;
-			return existingInput.getRepositoryTaskData() != null
+			return existingInput.getTaskData() != null
 					&& TracCorePlugin.REPOSITORY_KIND.equals(existingInput.getRepository().getKind());
 		} else if (input instanceof NewTaskEditorInput) {
 			NewTaskEditorInput newInput = (NewTaskEditorInput) input;
-			return newInput.getRepositoryTaskData() != null
+			return newInput.getTaskData() != null
 					&& TracCorePlugin.REPOSITORY_KIND.equals(newInput.getRepository().getKind());
 		}
 		return false;
@@ -64,7 +63,7 @@ public class TracTaskEditorFactory implements ITaskEditorFactory {
 		TaskRepository repository = TasksUiPlugin.getRepositoryManager().getRepository(TracCorePlugin.REPOSITORY_KIND,
 				tracTask.getRepositoryUrl());
 		try {
-			return new RepositoryTaskEditorInput(repository, tracTask.getTaskData(), AbstractRepositoryTask.getTaskId(tracTask.getHandleIdentifier()), tracTask.getUrl());
+			return new RepositoryTaskEditorInput(repository, tracTask.getHandleIdentifier(), tracTask.getUrl());
 //			return new RepositoryTaskEditorInput(repository, tracTask);
 		} catch (Exception e) {
 			MylarStatusHandler.fail(e, "Could not create Trac editor input", true);
diff --git a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
index 7f5fe816f..392f27558 100644
--- a/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
+++ b/org.eclipse.mylyn.trac.ui/src/org/eclipse/mylyn/internal/trac/ui/wizard/NewTracTaskPage.java
@@ -131,7 +131,7 @@ public class NewTracTaskPage extends WizardPage {
 
 		TracOfflineTaskHandler offlineHandler = (TracOfflineTaskHandler) connector.getOfflineTaskHandler();
 		this.taskData = new RepositoryTaskData(offlineHandler.getAttributeFactory(), TracCorePlugin.REPOSITORY_KIND,
-				taskRepository.getUrl(), TasksUiPlugin.getDefault().getOfflineReportsFile().getNextOfflineBugId());
+				taskRepository.getUrl(), TasksUiPlugin.getDefault().getTaskDataManager().getNextLocalTaskId());
 		TracOfflineTaskHandler.createDefaultAttributes(offlineHandler.getAttributeFactory(), taskData, client, false);
 	}