clean up

2 files changed, 16 insertions, 3 deletions

diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
index 52781be84..5533346d5 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/editors/text/TextEditor.java
@@ -71,13 +71,22 @@ public class TextEditor extends ExtendedTextEditor {
 	 */
 	public TextEditor() {
 		super();
+		if (getSourceViewerConfiguration() == null) {
+			// configuration not yet set by subclass
+			setSourceViewerConfiguration(new TextSourceViewerConfiguration(getNewPreferenceStore()));
+		}
+
 	}
 	
 	/**
-	 * Initializes this editor.
+	 * @inheritDoc
+	 * 
+	 * This method configures the editor but does not define a
+	 * <code>SourceViewerConfiguration</code>. When only interested in
+	 * providing a custom source viewer configuration, subclasses may extend
+	 * this method.
 	 */
 	protected void initializeEditor() {
-		setSourceViewerConfiguration(new TextSourceViewerConfiguration(getNewPreferenceStore()));
 		setEditorContextMenuId("#TextEditorContext"); //$NON-NLS-1$
 		setRulerContextMenuId("#TextRulerContext"); //$NON-NLS-1$
 		setHelpContextId(ITextEditorHelpContextIds.TEXT_EDITOR);
diff --git a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ExtendedTextEditor.java b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ExtendedTextEditor.java
index 62cda150b..51e921259 100644
--- a/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ExtendedTextEditor.java
+++ b/org.eclipse.ui.editors/src/org/eclipse/ui/texteditor/ExtendedTextEditor.java
@@ -181,7 +181,11 @@ public abstract class ExtendedTextEditor extends StatusTextEditor {
 	}
 	
 	/**
-	 * Initializes this editor.
+	 * Initializes this editor. Subclasses may re-implement. If sub-classes do
+	 * not change the contract, this method should not be extended, i.e. do not
+	 * call <code>super.initializeEditor()</code> in order to avoid the
+	 * temporary creation of objects that are immediately overwritten by
+	 * subclasses.
 	 */
 	protected void initializeEditor() {
 		setPreferenceStore(EditorsPlugin.getDefault().getPreferenceStore());