From 113da94aad098175fcc200a664fd8cd2ed18a51c Mon Sep 17 00:00:00 2001 From: Sergey Prigogin Date: Fri, 30 Sep 2016 11:39:44 -0700 Subject: Bug 213780 - Compare With direction should be configurable Minor Javadoc correction. Change-Id: Ia46d4101ca6a49d4de202ade02a888339d008c51 --- .../org/eclipse/compare/contentmergeviewer/ContentMergeViewer.java | 5 +++-- 1 file 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() { -- cgit v1.2.3