Attachment 205988 Details for Bug 312893 – Fixing refreshing in ContentMergeViewer

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

[patch] Fixing refreshing in ContentMergeViewer

patch_312893.txt (text/plain), 999 bytes, created by Malgorzata Janczarska

on 2011-10-26 10:42:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Malgorzata Janczarska

Created: 2011-10-26 10:42:35 EDT

Size: 999 bytes

patch

obsolete

>From 45ebc0e2f7a4355a5a334b5996070d4be5727520 Wed, 26 Oct 2011 16:04:56 +0200
>From: Malgorzata Janczarska <malgorzata.tomczyk@pl.ibm.com>
>Date: Wed, 26 Oct 2011 15:57:54 +0200
>Subject: [PATCH] ASSIGNED - bug 312893: Flushing content merge viewer resets dirty flag for a Saveable that is not being saved  https://bugs.eclipse.org/bugs/show_bug.cgi?id=312893
>
>diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
>index b479316..9980c51 100644
>--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
>+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java
>@@ -1306,6 +1306,9 @@
> 				}
> 			}
> 		}
>+		if (isSaving() && (isLeftDirty() || isRightDirty())) {
>+			return; // Do not refresh until saving both sides is complete
>+		}
> 		refresh();
> 	}
>

Actions: View | Diff

Attachments on bug 312893: 192276 | 205988 | 206199 | 206200