diff options
| author | Niraj Modi | 2020-12-10 07:48:54 +0000 |
|---|---|---|
| committer | Niraj Modi | 2020-12-10 07:48:54 +0000 |
| commit | 80499648edf603efe314637a36c76868ee7858c0 (patch) | |
| tree | 4d9c588a3149d58d4975bbe97dcbc682b43526fc | |
| parent | 480d50435a33e11757644f6fcab04aa0d5897920 (diff) | |
| download | eclipse.platform.team-R4_11_maintenance.tar.gz eclipse.platform.team-R4_11_maintenance.tar.xz eclipse.platform.team-R4_11_maintenance.zip | |
Bug 552352 - Using SWAP in Compare editor loses changes and dirty statusR4_11_maintenance
- Back-port fix to 4.11+ branch
Change-Id: Ie6a4685163377f485919db8d583e13b30f7733ce
Signed-off-by: Niraj Modi <niraj.modi@in.ibm.com>
| -rw-r--r-- | bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java | 13 |
1 files changed, 12 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 1d8a071eb..238aa8232 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, 2018 IBM Corporation and others. + * Copyright (c) 2000, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -915,6 +915,17 @@ public abstract class ContentMergeViewer extends ContentViewer fSwitchLeftAndRight = new Action() { @Override public void run() { + /* + * Bug 552352: When comparing .txt files with corresponding .txt file editors + * closed and user modifies the content of one of the .txt file in the compare + * view and the compare state becomes 'dirty' and if followed by a 'Swap' + * action, modifications get lost. This data loss is considered a severe + * problem, so to avoid this modified data loss in this scenario, show a + * confirmation dialog to 'save' the file before swapping and let user decide + * and take a call on this. Note: Issue not seen with .java & .properties files. + */ + doSave(null, getInput()); + IPreferenceStore preferences = getCompareConfiguration().getPreferenceStore(); preferences.setValue(ComparePreferencePage.SWAPPED, !getCompareConfiguration().isMirrored()); if (preferences instanceof IPersistentPreferenceStore) { |