Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Prigogin2016-09-30 14:39:44 -0400
committerSergey Prigogin2016-09-30 14:39:44 -0400
commit113da94aad098175fcc200a664fd8cd2ed18a51c (patch)
tree81d7882f3f9aa46f3019827bdc0548438a3f0d3b
parent5ee45ccc30b17601d1a332c034a6a9e3dd843718 (diff)
downloadeclipse.platform.team-113da94aad098175fcc200a664fd8cd2ed18a51c.tar.gz
eclipse.platform.team-113da94aad098175fcc200a664fd8cd2ed18a51c.tar.xz
eclipse.platform.team-113da94aad098175fcc200a664fd8cd2ed18a51c.zip
Bug 213780 - Compare With direction should be configurable
Minor Javadoc correction. Change-Id: Ia46d4101ca6a49d4de202ade02a888339d008c51
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java5
1 files changed, 3 insertions, 2 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 cde614ca8..1b150e318 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
@@ -1234,6 +1234,7 @@ public abstract class ContentMergeViewer extends ContentViewer
* @throws CoreException
* @deprecated use {@link IFlushable#flush(IProgressMonitor)}.
*/
+ @Deprecated
public void save(IProgressMonitor monitor) throws CoreException {
flush(monitor);
}
@@ -1438,9 +1439,9 @@ public abstract class ContentMergeViewer extends ContentViewer
}
/**
- * If the inputs are mirrored, this asks the right model value.
+ * If the inputs are mirrored, this asks the left model value.
*
- * @return true if the left viewer is editable.
+ * @return true if the right viewer is editable.
* @since 3.7
*/
protected boolean isRightEditable() {

Back to the top