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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 666b2c4..42ac482 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -145,58 +145,22 @@
 
    <extension
          point="org.eclipse.team.core.fileTypes">
-      <fileTypes
-            type="text"
-            extension="php">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php3">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php4">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="php5">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="module">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="inc">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="phtml">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="html">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="htm">
-      </fileTypes>
-      <fileTypes
-            type="text"
-            extension="xhtml">
-      </fileTypes>
-  <!--    <fileTypes
-            type="text"
-            extension="tpl">
-      </fileTypes> -->
+      <fileTypes type="text" extension="php" />
+      <fileTypes type="text" extension="php3" />
+      <fileTypes type="text" extension="php4" />
+      <fileTypes type="text" extension="php5" />
+      <fileTypes type="text" extension="module" />
+      <fileTypes type="text" extension="inc" />
+      <fileTypes type="text" extension="phtml" />
    </extension>
 
+<!-- declares a content type for PHP Source files -->
+
    <extension point="org.eclipse.core.runtime.contentTypes">
-	<!-- declares a content type for PHP Source files -->
 	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"/>
+		file-extensions="php,php3,php4,php5,phtml,inc,module"/>
    </extension>
 
    <extension
@@ -207,7 +171,7 @@
          label="%sequentialHover"
          description="%sequentialHoverDescription">
    </hover>
-</extension>
+   </extension>
 
 <extension
       point="net.sourceforge.phpeclipse.phpEditorTextHovers">
@@ -411,11 +375,13 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
-            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
             id="net.sourceforge.phpeclipse.PHPUnitEditor">
+            <contentTypeBinding
+               contentTypeId="net.sourceforge.phpeclipse.phpSource"
+            />
       </editor>
  <!--     <editor
             name="%phpEditorName"
@@ -1278,7 +1244,7 @@
          name="%javaDocumentSetupParticipant"
          point="org.eclipse.core.filebuffers.documentSetup">
       <participant
-            extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
+            contentTypeId="net.sourceforge.phpeclipse.phpSource"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
       </participant>
    <!--   <participant
@@ -1295,7 +1261,7 @@
          name="%javaDocumentFactory"
          point="org.eclipse.core.filebuffers.documentCreation">
       <factory
-            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
+            contentTypeId="net.sourceforge.phpeclipse.phpSource"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
       </factory>
    </extension>
@@ -1396,11 +1362,18 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
             id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
       </page>
+      <page
+            name="%editorMarkOccurrencesPage"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage"
+            id="net.sourceforge.phpdt.internal.ui.preferences.MarkOccurrencesPreferencePage">
+  <!--       <keywordReference id="org.eclipse.jdt.ui.markoccurrences"/> -->
+      </page>
    </extension>
  <!--  <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
-            extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml"
+            extensions="php,php3,php4,php5,phtml,inc,module"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
@@ -1501,7 +1474,6 @@
    </extension> -->
 
 <!-- external tools -->
-
 <!-- extension point definitions -->
 	<extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
 	<extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>