Attachment 192984 Details for Bug 339171 – CC in tooltip

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

[patch] CC in tooltip

clipboard.txt (text/plain), 8.41 KB, created by Sam Davis

on 2011-04-11 18:39:18 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Davis

Created: 2011-04-11 18:39:18 EDT

Size: 8.41 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/Messages.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/Messages.java,v
>retrieving revision 1.1
>diff -u -r1.1 Messages.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/Messages.java	5 Dec 2008 01:18:27 -0000	1.1
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/Messages.java	11 Apr 2011 22:21:42 -0000
>@@ -27,10 +27,16 @@
> 
> 	public static String TaskDataDiff_more_;
> 
>+	public static String TaskDiffUtil_Added_to;
>+
> 	public static String TaskDiffUtil_attachment;
> 
>+	public static String TaskDiffUtil_CC;
>+
> 	public static String TaskDiffUtil_Comment_by_X;
> 
>+	public static String TaskDiffUtil_Removed_from;
>+
> 	public static String TaskDiffUtil_Unknown;
> 
> 	public static String TaskListNotificationPopup_Mark_Task_Read;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java,v
>retrieving revision 1.8
>diff -u -r1.8 TaskDiffUtil.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java	1 Mar 2011 09:08:46 -0000	1.8
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/TaskDiffUtil.java	11 Apr 2011 22:21:42 -0000
>@@ -12,6 +12,7 @@
> package org.eclipse.mylyn.internal.tasks.ui.notifications;
> 
> import java.text.MessageFormat;
>+import java.util.ArrayList;
> import java.util.Iterator;
> import java.util.List;
> 
>@@ -20,6 +21,7 @@
> import org.eclipse.mylyn.tasks.core.IRepositoryPerson;
> import org.eclipse.mylyn.tasks.core.ITaskComment;
> import org.eclipse.mylyn.tasks.core.data.ITaskAttributeDiff;
>+import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.graphics.Drawable;
> import org.eclipse.swt.graphics.GC;
>@@ -30,6 +32,10 @@
>  */
> public class TaskDiffUtil {
> 
>+	private static final int MAX_LENGTH = 68;
>+
>+	private static final int ONE_SIDE_MAX_LENGTH = 28;
>+
> 	private static final int MAX_CHANGED_ATTRIBUTES = 2;
> 
> 	// could use the ellipsis glyph on some platforms "\u2026"
>@@ -56,10 +62,12 @@
> 				}
> 			}
> 
>-			sb.append(TaskDiffUtil.trim(TaskDiffUtil.commentToString(comment), 60));
>+			String moreComments = ""; //$NON-NLS-1$
> 			if (newCommentCount > 1) {
>-				sb.append(" (" + (newCommentCount - 1) + Messages.TaskDataDiff_more_); //$NON-NLS-1$
>+				moreComments = " (" + (newCommentCount - 1) + Messages.TaskDataDiff_more_; //$NON-NLS-1$
> 			}
>+			sb.append(TaskDiffUtil.trim(TaskDiffUtil.commentToString(comment), MAX_LENGTH - moreComments.length())
>+					+ moreComments);
> 			sep = "\n"; //$NON-NLS-1$
> 		}
> 		// append changed attributes		
>@@ -72,18 +80,79 @@
> 				sb.append(" "); //$NON-NLS-1$
> 				sb.append(label);
> 				sb.append(" "); //$NON-NLS-1$
>-				sb.append(TaskDiffUtil.trim(TaskDiffUtil.listToString(attributeDiff.getRemovedValues()), 28));
>+				String removedValues = TaskDiffUtil.listToString(attributeDiff.getRemovedValues());
>+				String addedValues = TaskDiffUtil.listToString(attributeDiff.getAddedValues());
>+				int removedExtraSpace = 0, addedExtraSpace = 0;
>+				if (removedValues.length() < ONE_SIDE_MAX_LENGTH) {
>+					addedExtraSpace = ONE_SIDE_MAX_LENGTH - removedValues.length();
>+				}
>+				if (addedValues.length() < ONE_SIDE_MAX_LENGTH) {
>+					removedExtraSpace = ONE_SIDE_MAX_LENGTH - addedValues.length();
>+				}
>+				sb.append(TaskDiffUtil.trim(removedValues, ONE_SIDE_MAX_LENGTH + removedExtraSpace));
> 				sb.append(" -> "); //$NON-NLS-1$
>-				sb.append(TaskDiffUtil.trim(TaskDiffUtil.listToString(attributeDiff.getAddedValues()), 28));
>+				sb.append(TaskDiffUtil.trim(addedValues, ONE_SIDE_MAX_LENGTH + addedExtraSpace));
> 				if (++n == MAX_CHANGED_ATTRIBUTES) {
> 					break;
> 				}
> 				sep = "\n"; //$NON-NLS-1$
> 			}
> 		}
>+		if (n++ < MAX_CHANGED_ATTRIBUTES) {
>+			TaskAttribute newCCAttribute = diff.getNewTaskData().getRoot().getMappedAttribute(TaskAttribute.USER_CC);
>+			TaskAttribute oldCCAttribute = null;
>+			if (diff.getOldTaskData() != null) {
>+				oldCCAttribute = diff.getOldTaskData().getRoot().getMappedAttribute(TaskAttribute.USER_CC);
>+			}
>+			if (newCCAttribute != null || oldCCAttribute != null) {
>+				TaskAttributeDiff attributeDiff = new TaskAttributeDiff(oldCCAttribute, newCCAttribute);
>+				String label = attributeDiff.getLabel();
>+				if (label == null || label.length() == 0) {
>+					label = Messages.TaskDiffUtil_CC;
>+				}
>+				String removed = valuesToString(stripDomains(attributeDiff.getRemovedValues()),
>+						Messages.TaskDiffUtil_Removed_from, label);
>+				if (removed.length() > 0) {
>+					sb.append(sep);
>+					sb.append(trim(removed, MAX_LENGTH));
>+					sep = "\n"; //$NON-NLS-1$
>+				}
>+				String added = valuesToString(stripDomains(attributeDiff.getAddedValues()),
>+						Messages.TaskDiffUtil_Added_to, label);
>+				if (added.length() > 0) {
>+					sb.append(sep);
>+					sb.append(trim(added, MAX_LENGTH));
>+					sep = "\n"; //$NON-NLS-1$
>+				}
>+			}
>+		}
> 		return sb.toString();
> 	}
> 
>+	public static String valuesToString(List<String> values, String changeDescription, String label) {
>+		StringBuilder sb = new StringBuilder();
>+		if (!values.isEmpty()) {
>+			sb.append(" "); //$NON-NLS-1$
>+			sb.append(changeDescription);
>+			sb.append(label);
>+			sb.append(" "); //$NON-NLS-1$
>+			sb.append(TaskDiffUtil.listToString(values));
>+		}
>+		return sb.toString();
>+	}
>+
>+	public static List<String> stripDomains(List<String> emails) {
>+		List<String> result = new ArrayList<String>();
>+		for (String s : emails) {
>+			int at = s.lastIndexOf('@');
>+			if (at != -1) {
>+				s = s.substring(0, at);
>+			}
>+			result.add(s);
>+		}
>+		return result;
>+	}
>+
> 	public static String commentToString(ITaskComment comment) {
> 		StringBuilder sb = new StringBuilder();
> 		sb.append(MessageFormat.format(Messages.TaskDiffUtil_Comment_by_X, personToString(comment.getAuthor())));
>Index: src/org/eclipse/mylyn/internal/tasks/ui/notifications/messages.properties
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/notifications/messages.properties,v
>retrieving revision 1.2
>diff -u -r1.2 messages.properties
>--- src/org/eclipse/mylyn/internal/tasks/ui/notifications/messages.properties	24 Jul 2009 12:05:46 -0000	1.2
>+++ src/org/eclipse/mylyn/internal/tasks/ui/notifications/messages.properties	11 Apr 2011 22:21:42 -0000
>@@ -10,8 +10,11 @@
> ###############################################################################
> TaskDataDiff_more_=\ more)
> 
>+TaskDiffUtil_Added_to=Added to 
> TaskDiffUtil_attachment=\ attachment: 
>+TaskDiffUtil_CC=CC
> TaskDiffUtil_Comment_by_X=Comment by {0}
>+TaskDiffUtil_Removed_from=Removed from 
> TaskDiffUtil_Unknown=Unknown
> 
> TaskListNotificationPopup_Mark_Task_Read=Mark Task Read
>Index: src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java
>===================================================================
>RCS file: /cvsroot/mylyn/org.eclipse.mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java,v
>retrieving revision 1.86
>diff -u -r1.86 TaskListToolTip.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java	2 Mar 2011 23:13:15 -0000	1.86
>+++ src/org/eclipse/mylyn/internal/tasks/ui/views/TaskListToolTip.java	11 Apr 2011 22:21:42 -0000
>@@ -292,7 +292,7 @@
> 		return null;
> 	}
> 
>-	private String getIncommingText(IRepositoryElement element) {
>+	private String getIncomingText(IRepositoryElement element) {
> 		if (element instanceof ITask) {
> 			ITask task = (ITask) element;
> 			if (task.getSynchronizationState().isIncoming()) {
>@@ -482,7 +482,7 @@
> 			addIconAndLabel(composite, CommonImages.getImage(CommonImages.CALENDAR), activityText);
> 		}
> 
>-		String incommingText = getIncommingText(currentTipElement);
>+		String incommingText = getIncomingText(currentTipElement);
> 		if (incommingText != null) {
> 			Image image = CommonImages.getImage(CommonImages.OVERLAY_SYNC_INCOMMING);
> 			if (currentTipElement instanceof ITask) {

Actions: View | Diff

Attachments on bug 339171: 192984 | 192985 | 192991