Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDani Megert2010-04-14 10:59:37 +0000
committerDani Megert2010-04-14 10:59:37 +0000
commit373df3ad6204f4b4a1966017a2ed1442af0a8c21 (patch)
tree2180252b58c00479d133e85496564686c7831b39
parent8b7df6075c2e7d28138d22bdd1f2c5504b74bb01 (diff)
downloadeclipse.platform.text-373df3ad6204f4b4a1966017a2ed1442af0a8c21.tar.gz
eclipse.platform.text-373df3ad6204f4b4a1966017a2ed1442af0a8c21.tar.xz
eclipse.platform.text-373df3ad6204f4b4a1966017a2ed1442af0a8c21.zip
Fixed bug 309095: [implementation] Don't use Display.getDefault() in AbstractTextEditor
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java15
1 files changed, 7 insertions, 8 deletions
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 a24c3007c66..c38ffb15598 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
@@ -135,6 +135,7 @@ import org.eclipse.jface.text.ITextViewerExtension5;
import org.eclipse.jface.text.ITextViewerExtension6;
import org.eclipse.jface.text.ITextViewerExtension7;
import org.eclipse.jface.text.ITextViewerExtension8;
+import org.eclipse.jface.text.ITextViewerExtension8.EnrichMode;
import org.eclipse.jface.text.IUndoManager;
import org.eclipse.jface.text.IUndoManagerExtension;
import org.eclipse.jface.text.Position;
@@ -143,7 +144,6 @@ import org.eclipse.jface.text.TabsToSpacesConverter;
import org.eclipse.jface.text.TextEvent;
import org.eclipse.jface.text.TextSelection;
import org.eclipse.jface.text.TextUtilities;
-import org.eclipse.jface.text.ITextViewerExtension8.EnrichMode;
import org.eclipse.jface.text.hyperlink.IHyperlinkDetector;
import org.eclipse.jface.text.information.IInformationProvider;
import org.eclipse.jface.text.information.IInformationProviderExtension2;
@@ -2891,7 +2891,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
fMouseListener= new MouseListener() {
private boolean fDoubleClicked= false;
- private final int fDoubleClickTime= Display.getDefault().getDoubleClickTime();
+ private final int fDoubleClickTime= getSite().getShell().getDisplay().getDoubleClickTime();
private long fMouseUpDelta= 0;
private void triggerAction(String actionID) {
@@ -2919,7 +2919,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
if (delay <= 0)
runnable.run();
else
- Display.getDefault().timerExec(delay, runnable);
+ e.widget.getDisplay().timerExec(delay, runnable);
}
public void mouseDoubleClick(MouseEvent e) {
@@ -2932,11 +2932,10 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
public void mouseDown(MouseEvent e) {
fMouseUpDelta= System.currentTimeMillis();
fDoubleClicked= false;
- StyledText text= fSourceViewer.getTextWidget();
- if (text != null && !text.isDisposed()) {
- Display display= text.getDisplay();
- Point location= display.getCursorLocation();
- fRulerContextMenu.setLocation(location.x, location.y);
+ if (fRulerContextMenu != null && !fRulerContextMenu.isDisposed()) {
+ Display display= fRulerContextMenu.getDisplay();
+ Point location= display.getCursorLocation();
+ fRulerContextMenu.setLocation(location.x, location.y);
}
}
};

Back to the top