diff options
| author | Malgorzata Janczarska | 2011-11-23 17:04:11 +0000 |
|---|---|---|
| committer | Tomasz Zarna | 2011-11-23 17:04:11 +0000 |
| commit | 1bbe39d33b1ed5e57003e7e16b483d62633463f2 (patch) | |
| tree | 8f4a018180f602686616ace6c99557ffaa12e35b /bundles | |
| parent | 1d317a8da6b135518fc0f27e059e2d38a94760f8 (diff) | |
| download | eclipse.platform.team-1bbe39d33b1ed5e57003e7e16b483d62633463f2.tar.gz eclipse.platform.team-1bbe39d33b1ed5e57003e7e16b483d62633463f2.tar.xz eclipse.platform.team-1bbe39d33b1ed5e57003e7e16b483d62633463f2.zip | |
bug 312893: Flushing content merge viewer resets dirty flag for av20111123-1704
Saveable that is not being saved
Diffstat (limited to 'bundles')
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java | 5 |
1 files changed, 4 insertions, 1 deletions
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 b47931690..12b39c5b2 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 @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2000, 2010 IBM Corporation and others. + * Copyright (c) 2000, 2011 IBM Corporation 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 @@ -1306,6 +1306,9 @@ public abstract class ContentMergeViewer extends ContentViewer } } } + if (isSaving() && (isLeftDirty() || isRightDirty())) { + return; // Do not refresh until saving both sides is complete + } refresh(); } |