Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2016-12-21 16:40:46 -0500
committerSergey Prigogin2016-12-21 16:40:46 -0500
commitc5c97792aec32b7b51f0731cf6756c12022b92d5 (patch)
tree2d3be6eef915a6e6c672eddf10dbbfe3ff517c1b /bundles
parenteb049c01ec1f70e1456713104610b0483aa20bd7 (diff)
downloadeclipse.platform.team-c5c97792aec32b7b51f0731cf6756c12022b92d5.tar.gz
eclipse.platform.team-c5c97792aec32b7b51f0731cf6756c12022b92d5.tar.xz
eclipse.platform.team-c5c97792aec32b7b51f0731cf6756c12022b92d5.zip
Bug 509614 - Changes made in Compare editor are not saved when the left
and the right panes are swapped Change-Id: I2b6e84ec94f62379eef48a699720964b042d5f1d
Diffstat (limited to 'bundles')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
index fb265eb7d..a8fb2e16d 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java
@@ -5240,7 +5240,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
IMergeViewerContentProvider content= getMergeContentProvider();
Object leftContent = content.getLeftContent(oldInput);
- if (leftContent != null && getCompareConfiguration().isLeftEditable() && isLeftDirty()) {
+ if (leftContent != null && isLeftEditable() && isLeftDirty()) {
if (fLeftContributor.hasSharedDocument(leftContent)) {
if (flush(fLeftContributor))
setLeftDirty(false);
@@ -5257,7 +5257,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
IMergeViewerContentProvider content= getMergeContentProvider();
Object rightContent = content.getRightContent(oldInput);
- if (rightContent != null && getCompareConfiguration().isRightEditable() && isRightDirty()) {
+ if (rightContent != null && isRightEditable() && isRightDirty()) {
if (fRightContributor.hasSharedDocument(rightContent)) {
if (flush(fRightContributor))
setRightDirty(false);

Back to the top