Attachment 203949 Details for Bug 218896 – patch to above file

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

patch to above file

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

on 2011-09-23 19:02:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Sam Davis

Created: 2011-09-23 19:02:26 EDT

Size: 1.57 KB

patch

obsolete

>@@ -156,6 +156,8 @@
> 
> 	private CompareAction compareAction;
> 
>+	private String oldLastReadValue;
>+
> 	public DiffingTaskEditorDescriptionPart() {
> 	}
> 
>@@ -192,7 +194,16 @@
> 			TaskAttribute lastReadAttribute = getModel().getLastReadAttribute(attribute);
> 			if (isLocalChanged) {
> 				if (lastReadAttribute != null) {
>-					isRemoteChanged = !repositoryValue.equals(lastReadAttribute.getValue());
>+					/**
>+					 * the only reason that testing oldLastReadValue works when editing and then clicking refresh and
>+					 * getting incomings is that doSave is called before refresh, so this branch is executed twice, and
>+					 * the first pass sets oldLastReadValue to null
>+					 */
>+					if (oldLastReadValue != null && oldLastReadValue.equals(lastReadAttribute.getValue())) {
>+						isRemoteChanged = false;
>+					} else {
>+						isRemoteChanged = !repositoryValue.equals(lastReadAttribute.getValue());
>+					}
> 				}
> 				if (isRemoteChanged) {// persist conflicted state in case editor is closed and reopened
> 					getTaskEditorPage().getTask().setAttribute(ATT_CONFLICTED, Boolean.toString(true));
>@@ -201,12 +212,14 @@
> 				}
> 				localValue = currentValue;
> 				remoteValue = repositoryValue;
>+				oldLastReadValue = null;
> 			} else {
> 				getTaskEditorPage().getTask().setAttribute(ATT_CONFLICTED, Boolean.toString(false));
> 				if (lastReadAttribute == null) {
> 					return;
> 				}
> 				localValue = lastReadAttribute.getValue();
>+				oldLastReadValue = lastReadAttribute.getValue();
> 				remoteValue = currentValue;
> 				isRemoteChanged = true;
> 			}

Actions: View

Attachments on bug 218896: 203699 | 203949 | 265587