diff -ruN netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java --- netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java 2011-06-07 10:00:02.591195343 -0400 +++ netbeans/libs.bugtracking/src/org/netbeans/libs/bugtracking/BugtrackingRuntime.java 2011-06-13 10:17:30.140842508 -0400 @@ -47,9 +47,11 @@ import javax.swing.SwingUtilities; import org.eclipse.mylyn.commons.net.WebUtil; import org.eclipse.mylyn.internal.tasks.core.RepositoryExternalizationParticipant; +import org.eclipse.mylyn.internal.tasks.core.RepositoryModel; import org.eclipse.mylyn.internal.tasks.core.TaskActivityManager; import org.eclipse.mylyn.internal.tasks.core.TaskList; import org.eclipse.mylyn.internal.tasks.core.TaskRepositoryManager; +import org.eclipse.mylyn.internal.tasks.core.data.SynchronizationManger; import org.eclipse.mylyn.internal.tasks.core.data.TaskDataManager; import org.eclipse.mylyn.internal.tasks.core.data.TaskDataStore; import org.eclipse.mylyn.internal.tasks.core.externalization.ExternalizationManager; @@ -88,8 +90,10 @@ taskDataStore = new TaskDataStore(taskRepositoryManager); TaskList tl = new TaskList(); + RepositoryModel repositoryModel = new RepositoryModel(tl, taskRepositoryManager); + SynchronizationManger synchronizationManager = new SynchronizationManger(repositoryModel); TaskActivityManager tam = new TaskActivityManager(taskRepositoryManager, tl); - taskDataManager = new TaskDataManager(taskDataStore, taskRepositoryManager, tl, tam); + taskDataManager = new TaskDataManager(taskDataStore, taskRepositoryManager, tl, tam, synchronizationManager); taskDataManager.setDataPath(getCacheStore().getAbsolutePath()); synchronizationSession = new SynchronizationSession(taskDataManager); --- netbeans/bugzilla/src/org/netbeans/modules/bugzilla/issue/BugzillaIssue.java 2011-06-07 09:57:29.375195856 -0400 +++ netbeans/bugzilla/src/org/netbeans/modules/bugzilla/issue/BugzillaIssue.java 2011-06-13 18:06:09.913842768 -0400 @@ -757,7 +757,7 @@ private void setOperation(BugzillaOperation operation) { TaskAttribute rta = data.getRoot(); TaskAttribute ta = rta.getMappedAttribute(TaskAttribute.OPERATION); - ta.setValue(operation.name()); + ta.setValue(operation.toString()); } List<Attachment> getAttachments() { @@ -999,7 +999,7 @@ boolean isResolveAvailable () { Map<String, TaskOperation> operations = getAvailableOperations(); - return operations.containsKey(BugzillaOperation.resolve.name()); + return operations.containsKey(BugzillaOperation.resolve.toString()); } private Map<String, String> getSeenAttributes() {