Attachment 136893 Details for Bug 243655 – updated patch

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

[patch] updated patch

patch243655.txt (text/plain), 12.38 KB, created by Frank Becker

on 2009-05-23 15:06:04 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2009-05-23 15:06:04 EDT

Size: 12.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java,v
>retrieving revision 1.61
>diff -u -r1.61 TaskListToolTip.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java	19 May 2009 17:10:01 -0000	1.61
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java	23 May 2009 19:01:11 -0000
>@@ -290,7 +290,7 @@
> 						TasksUiPlugin.getTaskDataManager());
> 				TaskDataDiff diff = notifier.getDiff(task);
> 				if (diff != null) {
>-					text = diff.toString(MAX_TEXT_WIDTH);
>+					text = diff.toString(MAX_TEXT_WIDTH, false);
> 				}
> 				if (text != null && text.length() > 0) {
> 					return text;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDataDiff.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDataDiff.java,v
>retrieving revision 1.11
>diff -u -r1.11 TaskDataDiff.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDataDiff.java	13 Jan 2009 07:07:36 -0000	1.11
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDataDiff.java	23 May 2009 19:01:11 -0000
>@@ -12,6 +12,7 @@
> package org.eclipse.mylyn.internal.tasks.ui.notifications;
> 
> import java.util.Collection;
>+import java.util.Iterator;
> import java.util.LinkedHashSet;
> import java.util.Set;
> 
>@@ -121,17 +122,24 @@
> 
> 	@Override
> 	public String toString() {
>-		return toString(60);
>+		return toString(60, true);
> 	}
> 
> 	// TODO implement trim based on text width
>-	public String toString(int maxWidth) {
>+	public String toString(int maxWidth, boolean includeNewest) {
> 		StringBuilder sb = new StringBuilder();
> 		String sep = ""; //$NON-NLS-1$
> 		// append first comment
> 		int newCommentCount = newComments.size();
> 		if (newCommentCount > 0) {
>-			ITaskComment comment = newComments.iterator().next();
>+			Iterator<ITaskComment> iter = newComments.iterator();
>+			ITaskComment comment = iter.next();
>+			if (includeNewest) {
>+				while (iter.hasNext()) {
>+					comment = iter.next();
>+				}
>+			}
>+
> 			sb.append(TaskDiffUtil.trim(TaskDiffUtil.commentToString(comment), 60));
> 			if (newCommentCount > 1) {
> 				sb.append(" (" + (newCommentCount - 1) + Messages.TaskDataDiff_more_); //$NON-NLS-1$
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotifier.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotifier.java,v
>retrieving revision 1.8
>diff -u -r1.8 TaskListNotifier.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotifier.java	13 Jan 2009 07:07:36 -0000	1.8
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotifier.java	23 May 2009 19:01:11 -0000
>@@ -60,7 +60,7 @@
> 			TaskDataDiff diff = getDiff(task);
> 			if (diff != null) {
> 				TaskListNotification notification = new TaskListNotification(task, token);
>-				notification.setDescription(diff.toString());
>+				notification.setDescription(diff.toString(60, true));
> 				return notification;
> 			}
> 		}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java,v
>retrieving revision 1.9
>diff -u -r1.9 TaskListNotificationReminder.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java	13 Jan 2009 07:07:36 -0000	1.9
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationReminder.java	23 May 2009 19:01:11 -0000
>@@ -11,9 +11,6 @@
> 
> package org.eclipse.mylyn.internal.tasks.ui.notifications;
> 
>-import java.util.Date;
>-
>-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotification;
> import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.swt.graphics.Image;
>@@ -32,19 +29,4 @@
> 	public Image getNotificationKindImage() {
> 		return CommonImages.getImage(CommonImages.OVERLAY_DATE_DUE);
> 	}
>-
>-	@Override
>-	public int compareTo(AbstractNotification anotherNotification) throws ClassCastException {
>-		if (!(anotherNotification != null)) {
>-			throw new ClassCastException("A ITaskListNotification object expected."); //$NON-NLS-1$
>-		}
>-		Date anotherDate = (anotherNotification).getDate();
>-		if (date != null && anotherDate != null) {
>-			return date.compareTo(anotherDate);
>-		} else if (date == null) {
>-			return -1;
>-		} else {
>-			return 1;
>-		}
>-	}
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationQueryIncoming.java
>===================================================================
>RCS file: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationQueryIncoming.java
>diff -N src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationQueryIncoming.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotificationQueryIncoming.java	13 Jan 2009 07:07:36 -0000	1.10
>+++ /dev/null	1 Jan 1970 00:00:00 -0000
>@@ -1,47 +0,0 @@
>-/*******************************************************************************
>- * Copyright (c) 2004, 2008 Tasktop Technologies and others.
>- * All rights reserved. This program and the accompanying materials
>- * are made available under the terms of the Eclipse Public License v1.0
>- * which accompanies this distribution, and is available at
>- * http://www.eclipse.org/legal/epl-v10.html
>- *
>- * Contributors:
>- *     Tasktop Technologies - initial API and implementation
>- *******************************************************************************/
>-
>-package org.eclipse.mylyn.internal.tasks.ui.notifications;
>-
>-import java.util.Date;
>-
>-import org.eclipse.mylyn.internal.provisional.commons.ui.AbstractNotification;
>-import org.eclipse.mylyn.tasks.core.ITask;
>-
>-/**
>- * @author Rob Elves
>- */
>-public class TaskListNotificationQueryIncoming extends TaskListNotification {
>-
>-	public TaskListNotificationQueryIncoming(ITask task) {
>-		super(task);
>-	}
>-
>-	@Override
>-	public String getDescription() {
>-		return task.getSummary();
>-	}
>-
>-	@Override
>-	public int compareTo(AbstractNotification anotherNotification) throws ClassCastException {
>-		if (!(anotherNotification != null)) {
>-			throw new ClassCastException("A ITaskListNotification object expected."); //$NON-NLS-1$
>-		}
>-		Date anotherDate = (anotherNotification).getDate();
>-		if (date != null && anotherDate != null) {
>-			return date.compareTo(anotherDate);
>-		} else if (date == null) {
>-			return -1;
>-		} else {
>-			return 1;
>-		}
>-	}
>-}
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java,v
>retrieving revision 1.17
>diff -u -r1.17 TaskListNotification.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java	13 Jan 2009 07:07:36 -0000	1.17
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskListNotification.java	23 May 2009 19:01:11 -0000
>@@ -111,11 +111,11 @@
> 		}
> 		Date anotherDate = (anotherNotification).getDate();
> 		if (date != null && anotherDate != null) {
>-			return date.compareTo(anotherDate);
>+			return date.compareTo(anotherDate) * -1;
> 		} else if (date == null) {
>-			return -1;
>-		} else {
> 			return 1;
>+		} else {
>+			return -1;
> 		}
> 	}
> 
>Index: .refactorings/2009/5/21/refactorings.history
>===================================================================
>RCS file: .refactorings/2009/5/21/refactorings.history
>diff -N .refactorings/2009/5/21/refactorings.history
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .refactorings/2009/5/21/refactorings.history	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,4 @@
>+<?xml version="1.0" encoding="UTF-8"?>
>+<session version="1.0">
>+<refactoring accessors="true" comment="Delete 1 element(s) from project &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Original project: &apos;org.eclipse.mylyn.tasks.ui&apos;&#x0A;- Original element: &apos;org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationQueryIncoming.java&apos;" description="Delete element" element1="/src&lt;org.eclipse.mylyn.internal.tasks.ui.notifications{TaskListNotificationQueryIncoming.java" elements="1" flags="589830" id="org.eclipse.jdt.ui.delete" resources="0" stamp="1243100594137" subPackages="false" version="1.0"/>
>+</session>
>\ No newline at end of file
>Index: .refactorings/2009/5/21/refactorings.index
>===================================================================
>RCS file: .refactorings/2009/5/21/refactorings.index
>diff -N .refactorings/2009/5/21/refactorings.index
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ .refactorings/2009/5/21/refactorings.index	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,1 @@
>+1243100594137	Delete element
>#P org.eclipse.mylyn.sandbox.dev
>Index: src/org/eclipse/mylyn/internal/sandbox/dev/actions/TestTaskListNotificationAction.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.dev/src/org/eclipse/mylyn/internal/sandbox/dev/actions/TestTaskListNotificationAction.java,v
>retrieving revision 1.10
>diff -u -r1.10 TestTaskListNotificationAction.java
>--- src/org/eclipse/mylyn/internal/sandbox/dev/actions/TestTaskListNotificationAction.java	26 Feb 2009 21:29:32 -0000	1.10
>+++ src/org/eclipse/mylyn/internal/sandbox/dev/actions/TestTaskListNotificationAction.java	23 May 2009 19:01:13 -0000
>@@ -12,15 +12,15 @@
> package org.eclipse.mylyn.internal.sandbox.dev.actions;
> 
> import java.util.Collection;
>-import java.util.HashSet;
> import java.util.Iterator;
>-import java.util.Set;
> 
> import org.eclipse.jface.action.IAction;
> import org.eclipse.jface.viewers.ISelection;
> import org.eclipse.mylyn.internal.tasks.core.AbstractTask;
> import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
>+import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotification;
> import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotificationReminder;
>+import org.eclipse.mylyn.internal.tasks.ui.notifications.TaskListNotifier;
> import org.eclipse.ui.IWorkbenchWindow;
> import org.eclipse.ui.IWorkbenchWindowActionDelegate;
> 
>@@ -42,15 +42,24 @@
> 	public void run(IAction action) {
> 		Collection<AbstractTask> allTasks = TasksUiPlugin.getTaskList().getAllTasks();
> 		Iterator<AbstractTask> iterator = allTasks.iterator();
>-		Set<TaskListNotificationReminder> dummyNotifications = new HashSet<TaskListNotificationReminder>();
>-		for (int i = 0; i < 6; i++) {
>+		while (iterator.hasNext()) {
>+			AbstractTask task = iterator.next();
>+			if (task.getHandleIdentifier().equals("http://macmainz.dyndns.org/Internet/Bugzilla32-10")
>+					|| task.getHandleIdentifier().equals("http://macmainz.dyndns.org/Internet/Bugzilla32-8")) {
>+				TaskListNotifier notifier = new TaskListNotifier(TasksUiPlugin.getRepositoryModel(),
>+						TasksUiPlugin.getTaskDataManager());
>+				TaskListNotification notification = notifier.getNotification(task, null);
>+				TasksUiPlugin.getTaskListNotificationManager().getNotifications().add(notification);
>+			}
>+		}
>+		iterator = allTasks.iterator();
>+		for (int i = 0; i < 2; i++) {
> 			TaskListNotificationReminder notification = new TaskListNotificationReminder(iterator.next());
> 			notification.setDescription("Mylyn is the Task-Focused UI for Eclipse that reduces information overload "
> 					+ "\n..........and makes multi-tasking easy. It does this by making tasks a first class part of");
> //					+ "Eclipse, and integrating rich and offline editing for repositories such as Bugzilla, "
> //					+ "Trac, and JIRA. Once your tasks are integrated, Mylyn monitors your work activity to "
> //					+ "inidentify information relevant to the task-at-hand, and uses this task context to focus ");
>-			dummyNotifications.add(notification);
> 			TasksUiPlugin.getTaskListNotificationManager().getNotifications().add(notification);
> 		}
> 		TasksUiPlugin.getTaskListNotificationManager().showPopup();

Actions: View | Diff

Attachments on bug 243655: 136717 | 136718 | 136893 | 136894