Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Thoms2017-09-12 19:53:59 +0000
committerSopot Cela2017-09-15 12:34:36 +0000
commite341a61b8c18b906a60eee6886b5d0fc452797e1 (patch)
tree0f045e9031df603bb04442d322da96d390aaf436 /org.eclipse.ui.workbench.texteditor
parent436cf72b5d16b64ce88662e468a4839ed8dd99e9 (diff)
downloadeclipse.platform.text-e341a61b8c18b906a60eee6886b5d0fc452797e1.tar.gz
eclipse.platform.text-e341a61b8c18b906a60eee6886b5d0fc452797e1.tar.xz
eclipse.platform.text-e341a61b8c18b906a60eee6886b5d0fc452797e1.zip
Bug 522212 - Resolve redundant null checks
Change-Id: Iaea3ee9df3771e40bc1d5bc58cd96b871c576406 Signed-off-by: Karsten Thoms <karsten.thoms@itemis.de>
Diffstat (limited to 'org.eclipse.ui.workbench.texteditor')
-rw-r--r--org.eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/AbstractTextEditor.java8
1 files changed, 1 insertions, 7 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 7c9377d1c8d..c90f6e50e4c 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
@@ -6546,13 +6546,7 @@ public abstract class AbstractTextEditor extends EditorPart implements ITextEdit
Caret caret= new Caret(styledText, SWT.NULL);
Image image= createRawInsertModeCaretImage(styledText);
- if (image != null)
- caret.setImage(image);
- else {
- // XXX: Filed request to get a caret with auto-height: https://bugs.eclipse.org/bugs/show_bug.cgi?id=118612
- caret.setSize(getCaretWidthPreference(), styledText.getLineHeight());
- }
-
+ caret.setImage(image);
caret.setFont(styledText.getFont());
return caret;

Back to the top