Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2013-05-31 08:23:41 +0000
committerGerrit Code Review @ Eclipse.org2013-05-31 08:34:14 +0000
commitc1eda9e7be559403ce8888d7a27b1ce9a7cf0bc8 (patch)
treee0ae4a0cbe79802ba3f7cf0a8afb3705656ce956
parent79ca1aa040851730f29de0d019930aa61d677c71 (diff)
downloadorg.eclipse.emf.compare-c1eda9e7be559403ce8888d7a27b1ce9a7cf0bc8.tar.gz
org.eclipse.emf.compare-c1eda9e7be559403ce8888d7a27b1ce9a7cf0bc8.tar.xz
org.eclipse.emf.compare-c1eda9e7be559403ce8888d7a27b1ce9a7cf0bc8.zip
[409293] Fix for Exporting comparison model fails after a merge
Disable export comparison model action when editor is dirty. Bug: 409293 Change-Id: If7f828e2cc375e7e109274cc2826f719d73ba2c0
-rw-r--r--plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
index c25269d40..ac766f585 100644
--- a/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
+++ b/plugins/org.eclipse.emf.compare.rcp.ui/src/org/eclipse/emf/compare/rcp/ui/internal/structuremergeviewer/handler/ModelSaveablePropertyTester.java
@@ -38,6 +38,8 @@ public class ModelSaveablePropertyTester extends PropertyTester {
CompareConfiguration configuration = ((CompareEditorInput)i).getCompareConfiguration();
if (!configuration.isLeftEditable() || !configuration.isRightEditable()) {
return false;
+ } else if (((CompareEditorInput)i).isDirty()) {
+ return false;
}
}
}

Back to the top