Attachment 154430 Details for Bug 296913 – commited patch

[patch] commited patch

patch296913.txt (text/plain), 3.99 KB, created by Frank Becker

on 2009-12-14 14:24:05 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2009-12-14 14:24:05 EST

Size: 3.99 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java,v
>retrieving revision 1.13
>diff -u -r1.13 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java	28 Sep 2009 20:30:20 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/tasks/ui/util/Messages.java	14 Dec 2009 19:25:10 -0000
>@@ -55,6 +55,8 @@
> 
> 	public static String SortKindEntry_Task_ID;
> 
>+	public static String SortKindEntry_Due_Date;
>+
> 	public static String SaveAttachmentsAction_directoryDoesntExist;
> 
> 	public static String SaveAttachmentsAction_directoryDoesntExist0;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/util/SortCriterion.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/SortCriterion.java,v
>retrieving revision 1.3
>diff -u -r1.3 SortCriterion.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/util/SortCriterion.java	28 Sep 2009 20:30:20 -0000	1.3
>+++ src/org/eclipse/mylyn/internal/tasks/ui/util/SortCriterion.java	14 Dec 2009 19:25:10 -0000
>@@ -22,7 +22,7 @@
> public class SortCriterion {
> 
> 	public enum SortKey {
>-		NONE, DATE_CREATED, PRIORITY, RANK, SUMMARY, TASK_ID, TASK_TYPE;
>+		NONE, DATE_CREATED, PRIORITY, RANK, SUMMARY, TASK_ID, TASK_TYPE, DUE_DATE;
> 
> 		public static SortKey valueOfLabel(String label) {
> 			for (SortKey value : values()) {
>@@ -49,6 +49,8 @@
> 				return Messages.SortKindEntry_Task_ID;
> 			case TASK_TYPE:
> 				return Messages.SortCriterion_Type;
>+			case DUE_DATE:
>+				return Messages.SortKindEntry_Due_Date;
> 			default:
> 				return null;
> 			}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/util/TaskComparator.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/TaskComparator.java,v
>retrieving revision 1.12
>diff -u -r1.12 TaskComparator.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/util/TaskComparator.java	28 Sep 2009 20:30:20 -0000	1.12
>+++ src/org/eclipse/mylyn/internal/tasks/ui/util/TaskComparator.java	14 Dec 2009 19:25:10 -0000
>@@ -94,6 +94,9 @@
> 			case TASK_TYPE:
> 				result = compare(element1.getTaskKind(), element2.getTaskKind(), key.getDirection());
> 				break;
>+			case DUE_DATE:
>+				result = sortByDueDate(element1, element2, key.getDirection());
>+				break;
> 			default: // NONE
> 				return 0;
> 			}
>@@ -142,6 +145,17 @@
> 		return sortDirection * date1.compareTo(date2);
> 	}
> 
>+	private int sortByDueDate(ITask element1, ITask element2, int sortDirection) {
>+		Date date1 = element1.getDueDate();
>+		Date date2 = element2.getDueDate();
>+		if (date1 == null) {
>+			return (date2 != null) ? sortDirection : 0;
>+		} else if (date2 == null) {
>+			return -sortDirection;
>+		}
>+		return sortDirection * date1.compareTo(date2);
>+	}
>+
> 	private <T> int compare(Comparable<T> key1, T key2, int sortDirection) {
> 		if (key1 == null) {
> 			return (key2 != null) ? sortDirection : 0;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties,v
>retrieving revision 1.13
>diff -u -r1.13 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties	28 Sep 2009 20:30:20 -0000	1.13
>+++ src/org/eclipse/mylyn/internal/tasks/ui/util/messages.properties	14 Dec 2009 19:25:10 -0000
>@@ -25,6 +25,7 @@
> SortKindEntry_Rank=Rank
> SortKindEntry_Summary=Summary
> SortKindEntry_Task_ID=Task ID
>+SortKindEntry_Due_Date=Due Date
> 
> SaveAttachmentsAction_directoryDoesntExist=Directory doesn't exist
> SaveAttachmentsAction_directoryDoesntExist0=Directory {0} doesn't exist.

Actions: View | Diff

Attachments on bug 296913: 154430 | 154431