Attachment 58817 Details for Bug 172061 – mark completed query hits as such

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

mark completed query hits as such

jira-query-hit-status-fix.patch (text/plain), 5.00 KB, created by Steffen Pingel

on 2007-02-12 20:22:00 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Pingel

Created: 2007-02-12 20:22:00 EST

Size: 5.00 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylar.jira.tests
>Index: src/org/eclipse/mylar/jira/tests/JiraTaskExternalizationTest.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.jira.tests/src/org/eclipse/mylar/jira/tests/JiraTaskExternalizationTest.java,v
>retrieving revision 1.42
>diff -u -r1.42 JiraTaskExternalizationTest.java
>--- src/org/eclipse/mylar/jira/tests/JiraTaskExternalizationTest.java	10 Feb 2007 04:03:37 -0000	1.42
>+++ src/org/eclipse/mylar/jira/tests/JiraTaskExternalizationTest.java	13 Feb 2007 01:13:51 -0000
>@@ -175,7 +175,7 @@
> 		taskList.addTask(jiraTask);
> 		JiraRepositoryConnector.updateTaskDetails(repository.getUrl(), jiraTask, jiraIssue, true);
> 		TasksUiPlugin.getTaskListManager().getTaskList().addTask(jiraTask);
>-		JiraQueryHit jiraHit = new JiraQueryHit(taskList, jiraTask.getSummary(), repository.getUrl(), "123", jiraTask.getKey(), false);
>+		JiraQueryHit jiraHit = new JiraQueryHit(taskList, jiraTask.getSummary(), repository.getUrl(), "123", jiraTask.getKey());
> 		jiraHit.setCorrespondingTask(jiraTask);
> 		assertNotNull(taskList.getTask(jiraHit.getHandleIdentifier()));
> 		jiraRepositoryQuery.addHit(jiraHit);
>#P org.eclipse.mylar.jira.ui
>Index: src/org/eclipse/mylar/internal/jira/ui/JiraRepositoryConnector.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.jira.ui/src/org/eclipse/mylar/internal/jira/ui/JiraRepositoryConnector.java,v
>retrieving revision 1.4
>diff -u -r1.4 JiraRepositoryConnector.java
>--- src/org/eclipse/mylar/internal/jira/ui/JiraRepositoryConnector.java	10 Feb 2007 04:03:48 -0000	1.4
>+++ src/org/eclipse/mylar/internal/jira/ui/JiraRepositoryConnector.java	13 Feb 2007 01:13:52 -0000
>@@ -157,11 +157,9 @@
> 			if (task instanceof JiraTask) {
> 				updateTaskDetails(repository.getUrl(), (JiraTask) task, issue, false);
> 			}
>-			// JiraQueryHit hit = new JiraQueryHit((JiraTask) task,
>-			// repositoryQuery.getRepositoryUrl(), issueId);
>-			// TODO: set completion status
> 			JiraQueryHit hit = new JiraQueryHit(taskList, issue.getSummary(), repositoryQuery.getRepositoryUrl(),
>-					taskId, issue.getKey(), false);
>+					taskId, issue.getKey());
>+			hit.setCompleted(isCompleted(issue));
> 			// XXX: HACK, need to map jira priority to tasklist priorities
> 			hit.setPriority(Task.PriorityLevel.P3.toString());
> 			try {
>@@ -340,7 +338,7 @@
> 				task.setKey(issue.getKey());
> 			}
> 		}
>-		if (issue.getStatus() != null && (issue.getStatus().isClosed() || issue.getStatus().isResolved())) {
>+		if (isCompleted(issue)) {
> 			task.setCompleted(true);
> 			task.setCompletionDate(issue.getUpdated());
> 		} else {
>@@ -365,6 +363,10 @@
> 		}
> 	}
> 
>+	private static boolean isCompleted(Issue issue) {
>+		return issue.getStatus() != null && (issue.getStatus().isClosed() || issue.getStatus().isResolved());
>+	}
>+
> 	public static JiraTask createTask(String repositoryUrl, String taskId, String key, String description) {
> 		JiraTask task;
> //		String handle = AbstractRepositoryTask.getHandle(repositoryUrl, taskId);
>Index: src/org/eclipse/mylar/internal/jira/ui/JiraQueryHit.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.jira.ui/src/org/eclipse/mylar/internal/jira/ui/JiraQueryHit.java,v
>retrieving revision 1.3
>diff -u -r1.3 JiraQueryHit.java
>--- src/org/eclipse/mylar/internal/jira/ui/JiraQueryHit.java	10 Feb 2007 05:13:56 -0000	1.3
>+++ src/org/eclipse/mylar/internal/jira/ui/JiraQueryHit.java	13 Feb 2007 01:13:51 -0000
>@@ -25,7 +25,7 @@
> 
> 	private String key = null;
> 
>-	public JiraQueryHit(TaskList taskList, String description, String repositoryUrl, String id, String key, boolean completed) {
>+	public JiraQueryHit(TaskList taskList, String description, String repositoryUrl, String id, String key) {
> 		super(taskList, repositoryUrl, description, id);
> 		this.key = key;
> 	}
>Index: src/org/eclipse/mylar/internal/jira/ui/JiraTaskExternalizer.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.mylar/org.eclipse.mylar.jira.ui/src/org/eclipse/mylar/internal/jira/ui/JiraTaskExternalizer.java,v
>retrieving revision 1.4
>diff -u -r1.4 JiraTaskExternalizer.java
>--- src/org/eclipse/mylar/internal/jira/ui/JiraTaskExternalizer.java	10 Feb 2007 05:13:56 -0000	1.4
>+++ src/org/eclipse/mylar/internal/jira/ui/JiraTaskExternalizer.java	13 Feb 2007 01:13:52 -0000
>@@ -276,7 +276,14 @@
> 		}
> 
> 		// TODO: implement completion
>-		JiraQueryHit hit = new JiraQueryHit(taskList, "<description>", query.getRepositoryUrl(), null, key, false);
>+		JiraQueryHit hit = new JiraQueryHit(taskList, "<description>", query.getRepositoryUrl(), null, key);
>+		// TODO move to DelegationTaskExternalizer
>+		if (element.hasAttribute(KEY_COMPLETE)
>+				&& element.getAttribute(KEY_COMPLETE).compareTo(VAL_TRUE) == 0) {
>+			hit.setCompleted(true);
>+		} else {
>+			hit.setCompleted(false);
>+		}
> 		readQueryHitInfo(hit, taskList, query, element);
> 	}
>

Actions: View

Attachments on bug 172061: 58817 | 58818