Attachment 72447 Details for Bug 166406 – few improvements

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

[patch] few improvements

clipboard.txt (text/plain), 4.42 KB, created by Eugene Kuleshov

on 2007-06-26 01:48:39 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Eugene Kuleshov

Created: 2007-06-26 01:48:39 EDT

Size: 4.42 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java,v
>retrieving revision 1.127
>diff -u -r1.127 TasksUiPlugin.java
>--- src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java	26 Jun 2007 01:16:41 -0000	1.127
>+++ src/org/eclipse/mylyn/tasks/ui/TasksUiPlugin.java	26 Jun 2007 05:42:52 -0000
>@@ -570,6 +570,7 @@
> 		store.setDefault(TasksUiPreferenceConstants.FILTER_PRIORITY, PriorityLevel.P5.toString());
> 		store.setDefault(TasksUiPreferenceConstants.EDITOR_TASKS_RICH, true);
> 		store.setDefault(TasksUiPreferenceConstants.ACTIVATE_WHEN_OPENED, false);
>+		store.setDefault(TasksUiPreferenceConstants.SHOW_TRIM, false);
> 
> 		store.setDefault(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_ENABLED, true);
> 		store.setDefault(TasksUiPreferenceConstants.REPOSITORY_SYNCH_SCHEDULE_MILISECONDS, "" + (20 * 60 * 1000));
>@@ -856,7 +857,7 @@
> 				TaskComment lastComment = taskComments.get(taskComments.size() - 1);
> 				if (lastComment != null) {
> 					descriptionText += "Comment by " + lastComment.getAuthor() + ":\n  ";
>-					String commentText = lastComment.getText();
>+					String commentText = lastComment.getText().replaceAll("\\s", " ").trim();
> 					if (commentText.length() > 60) {
> 						commentText = commentText.substring(0, 55) + "...";
> 					}
>@@ -865,49 +866,75 @@
> 			}
> 		}
> 
>-		if (descriptionText.equals("")) {
>-			String attributes = getChangedAttributes(newTaskData, oldTaskData);
>-			if (!attributes.equals("")) {
>-				descriptionText += "Attributes Changed:";
>-			}
>-		}
>-
> 		return descriptionText;
> 	}
> 
> 	private static String getChangedAttributes(RepositoryTaskData newTaskData, RepositoryTaskData oldTaskData) {
> 		List<Change> changes = new ArrayList<Change>();
> 		for (RepositoryTaskAttribute newAttribute : newTaskData.getAttributes()) {
>+			// HACK delta_ts is not a standard attribute
>+			if ("delta_ts,longdesclength,".contains(newAttribute.getId())) {
>+				continue;
>+			}
> 			List<String> newValues = newAttribute.getValues();
> 			RepositoryTaskAttribute oldAttribute = oldTaskData.getAttribute(newAttribute.getId());
> 			if (oldAttribute == null) {
> 				changes.add(getDiff(newAttribute.getName(), null, newValues));
>-				break;
> 			}
>-			List<String> oldValues = oldAttribute.getValues();
>-			if (!oldValues.equals(newValues)) {
>-				changes.add(getDiff(newAttribute.getName(), oldValues, newValues));
>-				break;
>+			if (oldAttribute != null) {
>+				List<String> oldValues = oldAttribute.getValues();
>+				if (!oldValues.equals(newValues)) {
>+					changes.add(getDiff(newAttribute.getName(), oldValues, newValues));
>+				}
> 			}
> 		}
>+
>+		for (RepositoryTaskAttribute oldAttribute : oldTaskData.getAttributes()) {
>+			if (oldAttribute.isHidden()) { // may not be a good idea
>+				continue;
>+			}
>+			RepositoryTaskAttribute attribute = newTaskData.getAttribute(oldAttribute.getId());
>+			List<String> values = oldAttribute.getValues();
>+			if (attribute == null && values != null && !values.isEmpty()) {
>+				changes.add(getDiff(oldAttribute.getName(), values, null));
>+			}
>+		}
>+
> 		if (changes.isEmpty()) {
> 			return "";
> 		}
> 
> 		String details = "";
> 		String sep = "";
>+		int n = 0;
> 		for (Change change : changes) {
>-			details += sep;
>-			if (!change.removed.isEmpty()) {
>-				details += "- " + change.field + " " + change.removed;
>-				sep = "\n";
>-			}
>-			if (!change.added.isEmpty()) {
>-				details += sep;
>-				details += "+ " + change.field + " " + change.added;
>-				sep = "\n";
>+			String removed = change.removed.toString();
>+			String added = change.added.toString();
>+			details += sep + "  " + change.field + " " + removed;
>+			if (removed.length() > 30) {
>+				details += "\n  ";
>+			}
>+			details += " -> " + added;
>+			sep = "\n";
>+			
>+//			if (!change.removed.isEmpty()) {
>+//				details += "- " + change.field + " " + change.removed;
>+//				sep = "\n";
>+//			}
>+//			if (!change.added.isEmpty()) {
>+//				details += sep;
>+//				details += "+ " + change.field + " " + change.added;
>+//				sep = "\n";
>+//			}
>+
>+			n++;
>+			if (n > 5) {  // that may not be enough
>+				break;
> 			}
> 		}
>+		if (!details.equals("")) {
>+			return "Attributes Changed:\n" + details;
>+		}
> 		return details;
> 	}

Actions: View | Diff

Attachments on bug 166406: 71690 | 71692 | 71763 | 71764 | 71772 | 71782 | 71811 | 71971 | 72100 | 72101 | 72389 | 72390 | 72447 | 72527 | 72607