Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2014-04-14 07:27:48 -0400
committerDani Megert2014-04-14 07:27:48 -0400
commit195f1d7f270e8dab12f167c74ae790bf3802943a (patch)
tree6a045677fcb7fec1b28783beaa7a6b72a80864b7
parentcf11213e61671f6f9541487dcaadad7d5b380de5 (diff)
downloadeclipse.platform.text-195f1d7f270e8dab12f167c74ae790bf3802943a.tar.gz
eclipse.platform.text-195f1d7f270e8dab12f167c74ae790bf3802943a.tar.xz
eclipse.platform.text-195f1d7f270e8dab12f167c74ae790bf3802943a.zip
Backported bug 368354: Copy/Paste fails intermittentlyr372_v20140414
-rw-r--r--org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java12
2 files changed, 7 insertions, 7 deletions
diff --git a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
index 48e74bf34..b80bbcd59 100644
--- a/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
+++ b/org.eclipse.ui.workbench.texteditor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.ui.workbench.texteditor; singleton:=true
-Bundle-Version: 3.7.0.qualifier
+Bundle-Version: 3.7.1.qualifier
Bundle-Activator: org.eclipse.ui.internal.texteditor.TextEditorPlugin
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %providerName
diff --git a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
index 40f60079c..74a1b0666 100644
--- a/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
+++ b/org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2011 IBM Corporation and others.
+ * Copyright (c) 2000, 2014 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1806,9 +1806,6 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
if (getRuler() == null)
return false;
- if (descriptor == null)
- return false;
-
return descriptor.matchesEditor(fEditor);
}
@@ -3120,6 +3117,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
public void run() {
// check whether editor has not been disposed yet
if (fSourceViewer != null && fSourceViewer.getDocument() != null) {
+ handleCursorPositionChanged();
updateSelectionDependentActions();
}
}
@@ -3130,8 +3128,10 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
public void selectionChanged(SelectionChangedEvent event) {
if (fDisplay == null)
fDisplay= getSite().getShell().getDisplay();
- fDisplay.asyncExec(fRunnable);
- handleCursorPositionChanged();
+ if (Display.getCurrent() == fDisplay)
+ fRunnable.run();
+ else
+ fDisplay.asyncExec(fRunnable);
}
};
}

Back to the top