X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 8533507..89e8568 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -315,7 +315,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>  
@@ -324,7 +324,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -333,7 +333,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -342,7 +342,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -351,7 +351,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/phpedit.gif"
             extensions="phtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -360,7 +360,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/htmledit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -369,7 +369,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/htmledit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -378,7 +378,7 @@ Temporarily replaced until errors can be ironed out...
             icon="icons/obj16/xmledit.gif"
             extensions="xml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             id="net.sourceforge.phpeclipse.PHPEditor"
             default="true">
       </editor>
@@ -537,12 +537,12 @@ Temporarily replaced until errors can be ironed out...
             class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
-      <page
-            name="Editor"
+  <!--    <page
+            name="Editor2"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page>
+      </page>  -->
       <page
             name="Outline"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
@@ -561,6 +561,12 @@ Temporarily replaced until errors can be ironed out...
 		class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
 		category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
 	  </page>
+	  <page 
+        name="Editor"
+		id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage"
+		class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
+		category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+	  </page>
       <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"