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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 4de2585..ebe915d 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -109,6 +109,8 @@
 	  <fileTypes type="text" extension="inc" />
 	  <fileTypes type="text" extension="phtml" />
 	  <fileTypes type="text" extension="phpt" />
+	  <fileTypes type="text" extension="html" />
+	  <fileTypes type="text" extension="htm" />
    </extension>
 
 <!-- declares a content type for PHP Source files -->
@@ -117,7 +119,7 @@
 	<content-type id="phpSource" name="%phpSourceName"
 		base-type="org.eclipse.core.runtime.text"
 		priority="high"
-		file-extensions="php,php3,php4,php5,phtml,inc,module,phpt"/>
+		file-extensions="php,php3,php4,php5,phtml,inc,module,phpt,html,htm"/>
    </extension>
 
    <extension
@@ -346,7 +348,7 @@
 	  <specification
 			annotationType="net.sourceforge.phpdt.ui.occurrences"
 			label="%OccurrenceAnnotation.label"
-			icon="icons/full/obj16/searchm_obj.gif"
+			icon="icons/obj16/searchm_obj.gif"
 			textPreferenceKey="occurrenceIndication"
 			textPreferenceValue="false"
 			highlightPreferenceKey="occurrenceHighlighting"
@@ -458,7 +460,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -469,7 +471,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php3"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php3">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -480,7 +482,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php4"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php4">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -491,7 +493,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.php5"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php5">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -502,7 +504,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.module"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.module">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -513,7 +515,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.inc"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.inc">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -524,7 +526,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.phtml"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.phtml">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -535,7 +537,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.html"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -546,7 +548,7 @@
 			<objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.htm"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.htm">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
@@ -557,7 +559,7 @@
 	  <objectContribution
 			objectClass="org.eclipse.core.resources.IFile"
 			nameFilter="*.xml"
-			id="net.sourceforge.phpeclipse.actions.popupShowAction">
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.xml">
 		 <action
 			   label="Open PHP Browser"
 			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"