From b6174a0c43e1387a9eef0c7e037b54874c7de020 Mon Sep 17 00:00:00 2001
From: David Inglis <dinglis@qnx.com>
Date: Mon, 25 Nov 2002 14:22:42 +0000
Subject: [PATCH] added line converter and encoding support to editor (eclipse
 2)

---
 core/org.eclipse.cdt.ui/ChangeLog                            | 5 +++++
 .../src/org/eclipse/cdt/internal/ui/editor/CEditor.java      | 4 ++--
 .../cdt/internal/ui/editor/CEditorActionContributor.java     | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index b99e199f319..16cd58f9a40 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-25 David Inglis
+	* src/.../internal/ui/editor/CEditor.java:(extends TextEditor)
+	* src/.../internal/ui/editor/CEditorActionContributor.java:(extends TextEditorActionContributor)
+	support line convertion actions and encoding.
+	
 2002-11-22 Alex Chapiro
 
 	* src/.../wizards/CProjectWizard.java:
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
index 70fc0dd0486..986f0658aa6 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditor.java
@@ -88,9 +88,9 @@ import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.actions.WorkspaceModifyOperation;
 import org.eclipse.ui.dialogs.SaveAsDialog;
+import org.eclipse.ui.editors.text.TextEditor;
 import org.eclipse.ui.part.EditorActionBarContributor;
 import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.texteditor.AbstractTextEditor;
 import org.eclipse.ui.texteditor.DefaultRangeIndicator;
 import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.MarkerAnnotation;
@@ -101,7 +101,7 @@ import org.eclipse.ui.views.tasklist.TaskList;
 /**
  * C specific text editor.
  */
-public class CEditor extends AbstractTextEditor implements ISelectionChangedListener {
+public class CEditor extends TextEditor implements ISelectionChangedListener {
 
 
 	/** The outline page */
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
index ea6dece3478..0e93cb182ff 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CEditorActionContributor.java
@@ -20,14 +20,14 @@ import org.eclipse.jface.viewers.ISelectionProvider;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.texteditor.BasicTextEditorActionContributor;
+import org.eclipse.ui.editors.text.TextEditorActionContributor;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.RetargetTextEditorAction;
 import org.eclipse.ui.texteditor.TextEditorAction;
 import org.eclipse.ui.texteditor.TextOperationAction;
 
 
-public class CEditorActionContributor extends BasicTextEditorActionContributor {
+public class CEditorActionContributor extends TextEditorActionContributor {
 
 	protected static class SelectionAction extends TextEditorAction implements ISelectionChangedListener {