Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2013-03-26 10:04:43 -0400
committerDani Megert2013-03-26 10:04:43 -0400
commita50fc819d7839768bab6e431ed337b2d2300dbe0 (patch)
tree62cec8b7419e351cff54258b4854900772ebd5e4
parent2da59d7561822e123dc06aab389afc02e5901f8e (diff)
downloadeclipse.platform.team-a50fc819d7839768bab6e431ed337b2d2300dbe0.tar.gz
eclipse.platform.team-a50fc819d7839768bab6e431ed337b2d2300dbe0.tar.xz
eclipse.platform.team-a50fc819d7839768bab6e431ed337b2d2300dbe0.zip
Revert "Bug 216407 - [Edit] "Copy Current from Right to Left" doesn't work when triggered after Undo"
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/contentmergeviewer/TextMergeViewer.java17
1 files changed, 4 insertions, 13 deletions
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 28ee9c1b9..727a07943 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
@@ -2986,9 +2986,9 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
* Implements IDocumentListener.
*/
private void documentChanged(DocumentEvent e, boolean dirty) {
-
- final IDocument doc = e.getDocument();
-
+
+ IDocument doc= e.getDocument();
+
if (doc == fLeft.getSourceViewer().getDocument()) {
setLeftDirty(dirty);
} else if (doc == fRight.getSourceViewer().getDocument()) {
@@ -2997,16 +2997,7 @@ public class TextMergeViewer extends ContentMergeViewer implements IAdaptable {
if (!isLeftDirty() && !isRightDirty()) {
fRedoDiff = false;
}
-
- new UIJob(CompareMessages.DocumentMerger_0) {
- public IStatus runInUIThread(IProgressMonitor monitor) {
- doDiff();
- invalidateLines();
- updateLines(doc);
- return Status.OK_STATUS;
- }
- }.schedule();
-
+ updateLines(doc);
}
/*

Back to the top