Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2016-12-21 16:40:46 -0500
committerSergey Prigogin2017-01-03 12:59:09 -0500
commit4232ff527399c4e437dc6a42433c91d5db3a88ae (patch)
treec04683f93bcdaec623236b3e58fffe0b16a40057
parent8b1a01247144b0ba43b34af7aa087ce06700f650 (diff)
downloadeclipse.platform.team-4232ff527399c4e437dc6a42433c91d5db3a88ae.tar.gz
eclipse.platform.team-4232ff527399c4e437dc6a42433c91d5db3a88ae.tar.xz
eclipse.platform.team-4232ff527399c4e437dc6a42433c91d5db3a88ae.zip
Bug 509614 - Changes made in Compare editor are not saved when the left
and the right panes are swapped Change-Id: I2b6e84ec94f62379eef48a699720964b042d5f1d
-rw-r--r--bundles/org.eclipse.compare/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java8
-rw-r--r--bundles/org.eclipse.compare/pom.xml2
3 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
index b5b0c15f9..fdb453249 100644
--- a/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.compare/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare; singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.1.qualifier
Bundle-Activator: org.eclipse.compare.internal.CompareUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
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 074dadbb4..e862e8984 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
@@ -5281,8 +5281,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
void flushLeftSide(Object oldInput, IProgressMonitor monitor){
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);
@@ -5298,8 +5298,8 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
void flushRightSide(Object oldInput, IProgressMonitor monitor){
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);
diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml
index cdd64025e..607979e96 100644
--- a/bundles/org.eclipse.compare/pom.xml
+++ b/bundles/org.eclipse.compare/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare</artifactId>
- <version>3.7.0-SNAPSHOT</version>
+ <version>3.7.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top