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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 0d6812b..8680c34 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -1,70 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse"
-   name="%pluginName"
-   version="1.1.5"
-   provider-name="%providerName"
-   class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
-    
-   <runtime>
-      <library name="phpeclipse.jar">
-        <export name="*"/>
-      </library>
- <!--     <library name="lib/hsqldb.jar"/> -->
- <!--     <library name="lib/xstream-1.0.2.jar" /> -->
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime.compatibility"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.ui.console"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.search"/> 
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
-      <import plugin="org.eclipse.compare"/>
-      <import plugin="org.eclipse.core.filebuffers"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.externaltools"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.team.core"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.update.ui"/>
-  <!--    <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>  -->
-   <!--   <import plugin="com.quantum.Quantum"/>  -->
-      <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
-      <import plugin="net.sourceforge.phpeclipse.externaltools"/>
-      <import plugin="net.sourceforge.phpeclipse.core"/>
-      <import plugin="net.sourceforge.phpeclipse.ui"/>
-      <import plugin="net.sourceforge.phpeclipse.xml.core"/>
-      <import plugin="net.sourceforge.phpeclipse.xml.ui"/>
-   </requires>
-
-   <extension
-         id="phpnature"
-         name="%naturePHP.name"
-         point="org.eclipse.core.resources.natures">
-      <runtime>
-         <run
-          class="net.sourceforge.phpdt.internal.core.JavaProject">
-         </run>
-      </runtime>
+<?eclipse version="3.2"?>
+<plugin>
+    <extension
+		 id="phpnature"
+		 name="%naturePHP.name"
+		 point="org.eclipse.core.resources.natures">
+	  <runtime>
+		 <run
+		  class="net.sourceforge.phpdt.internal.core.JavaProject">
+		 </run>
+	  </runtime>
    </extension>
-   
+
    <extension
-         id="parserbuilder"
-         name="PHP Builder"
-         point="org.eclipse.core.resources.builders">
-      <builder>
-         <run  
-           class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
-         </run>
-      </builder>
+		 id="parserbuilder"
+		 name="PHP Builder"
+		 point="org.eclipse.core.resources.builders">
+	  <builder>
+		 <run
+		   class="net.sourceforge.phpdt.internal.core.builder.PHPBuilder">
+		 </run>
+	  </builder>
    </extension>
    <!-- =================================================================================== -->
 <!-- Extension: Java Markers                                                             -->
@@ -79,7 +35,7 @@
 	<attribute name="id"/>
 	<attribute name="flags"/>
 	<attribute name="arguments"/>
-</extension>   
+</extension>
 
 <!-- Java transient problems -->
 
@@ -94,14 +50,14 @@
 <!-- PHP tasks -->
 
 <extension id="task" name="%phpTaskName" point="org.eclipse.core.resources.markers">
-    <super type="org.eclipse.core.resources.taskmarker"/> 
-    <persistent value="true"/>
+	<super type="org.eclipse.core.resources.taskmarker"/>
+	<persistent value="true"/>
 </extension>
 
 <extension-point id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.exsd"/>
-<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/> 
+<extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/>
 <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
-   
+
   <extension
 	point="org.eclipse.ui.decorators">
 	<decorator
@@ -118,17 +74,17 @@
 			<or>
 				<objectClass
 					name="org.eclipse.core.resources.IResource">
-				</objectClass>         
+				</objectClass>
 				<objectClass
 					name="net.sourceforge.phpdt.core.IJavaElement">
-				</objectClass> 
-			</or>                
+				</objectClass>
+			</or>
 		</enablement>
 	</decorator>
 	<decorator
 		label="%OverrideIndicatorLabelDecorator.label"
 		lightweight="true"
-		location="BOTTOM_RIGHT"		
+		location="BOTTOM_RIGHT"
 		state="true"
 		class="net.sourceforge.phpdt.ui.OverrideIndicatorLabelDecorator"
 		id="net.sourceforge.phpdt.ui.override.decorator">
@@ -140,1575 +96,815 @@
 				name="net.sourceforge.phpdt.core.IMethod">
 			</objectClass>
 		</enablement>
-	</decorator>	
+	</decorator>
   </extension>
-  
+
    <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> -->
+		 point="org.eclipse.team.core.fileTypes">
+	  <fileTypes type="text" extension="php" />
+	  <fileTypes type="text" extension="phpc" />
+	  <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" />
+	  <fileTypes type="text" extension="phpt" />
    </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" 
+	<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,phpc,php3,php4,php5,phtml,inc,module,phpt"/>
    </extension>
-   
+
    <extension
-      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+	  point="net.sourceforge.phpeclipse.phpEditorTextHovers">
    <hover
-         class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover"
-         id="net.sourceforge.phpdt.ui.BestMatchHover"
-         label="%sequentialHover"
-         description="%sequentialHoverDescription">
+		 class="net.sourceforge.phpdt.internal.ui.text.java.hover.BestMatchHover"
+		 id="net.sourceforge.phpdt.ui.BestMatchHover"
+		 label="%sequentialHover"
+		 description="%sequentialHoverDescription">
    </hover>
-</extension>
+   </extension>
 
 <extension
-      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+	  point="net.sourceforge.phpeclipse.phpEditorTextHovers">
    <hover
-         class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover"
-         id="net.sourceforge.phpdt.ui.JavaSourceHover"
-         label="%sourceHover"
-         description="%sourceHoverDescription">
+		 class="net.sourceforge.phpdt.internal.ui.text.java.hover.JavaSourceHover"
+		 id="net.sourceforge.phpdt.ui.JavaSourceHover"
+		 label="%sourceHover"
+		 description="%sourceHoverDescription">
    </hover>
    <hover
-            label="%problemHover"
-            description="%problemHoverDescription"
-            class="net.sourceforge.phpdt.internal.ui.text.java.hover.ProblemHover"
-            id="net.sourceforge.phpdt.ui.ProblemHover">
+			label="%problemHover"
+			description="%problemHoverDescription"
+			class="net.sourceforge.phpdt.internal.ui.text.java.hover.ProblemHover"
+			id="net.sourceforge.phpdt.ui.ProblemHover">
    </hover>
    <hover
-         class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
-         id="net.sourceforge.phpdt.ui.AnnotationHover"
-         label="%annotationHover" 
-         description="%annotationHoverDescription">
+		 class="net.sourceforge.phpdt.internal.ui.text.java.hover.AnnotationHover"
+		 id="net.sourceforge.phpdt.ui.AnnotationHover"
+		 label="%annotationHover"
+		 description="%annotationHoverDescription">
    </hover>
    </extension>
 
    <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            name="%perspectivePHP.name"
-            icon="icons/obj16/php.gif"
-            class="net.sourceforge.phpeclipse.PHPPerspectiveFactory"
-            id="net.sourceforge.phpeclipse.PHPPerspective">
-      </perspective>
+		 point="org.eclipse.ui.perspectives">
+	  <perspective
+			name="%perspectivePHP.name"
+			icon="icons/obj16/php.png"
+			class="net.sourceforge.phpeclipse.PHPPerspectiveFactory"
+			id="net.sourceforge.phpeclipse.PHPPerspective">
+	  </perspective>
    </extension>
-   
+
    <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="%newWizardCategory.name"
-            id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
-      </category>
-      <wizard
-            name="%newWizardPHPProject.name"
-            icon="icons/obj16/php.gif"
-            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.NewProjectCreationWizard"
-            project="true"
-            id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
-         <description>
-            Create a new PHP project.
-         </description>
-      </wizard>
- <!-- 	 <wizard
-		id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		name="%NewPHPClass.label"
-		class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
-		category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-		icon="icons/ctool16/newclass_wiz.gif">
-		<description>%NewPHPClass.description</description>
-	</wizard>      -->
-<!--
-<this wizard replaces it as it works - maybe not as pretty but still>
+		 point="org.eclipse.ui.perspectiveExtensions">
+	  <perspectiveExtension
+			targetID="net.sourceforge.phpeclipse.PHPPerspective">
+			   <showInPart id="net.sourceforge.phpeclipse.webbrowser.view" />
+			   <showInPart id="org.eclipse.ui.views.ResourceNavigator" />
+	  </perspectiveExtension>
+   </extension>
+
+   <extension
+		 point="org.eclipse.ui.newWizards">
+	  <category
+			name="%newWizardCategory.name"
+			id="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP">
+	  </category>
+	  <wizard
+			name="%newWizardPHPProject.name"
+			icon="icons/obj16/php.png"
+			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+			class="net.sourceforge.phpeclipse.wizards.NewProjectCreationWizard"
+			project="true"
+			id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
+		 <description>
+			Create a new PHP project.
+		 </description>
+	  </wizard>
 
-      <wizard
-            name="%newWizardPHPProject.name"
-            icon="icons/obj16/php.gif"
-            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.TempnewPHPProject"
-            project="true"
-            id="net.sourceforge.phpeclipse.wizards.NewWizardProjectCreation">
-         <description>
-            Create a new PHP project.
-         </description>
-      </wizard> -->
-      <wizard
-            name="%newWizardPHPFile.name"
-            icon="icons/obj16/phpedit.gif"
-            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
-            id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
-         <description>
-            Create a basic PHP file.
-         </description>
-      </wizard>
-      <wizard
-            name="%newWizardHTMLFile.name"
-            icon="icons/obj16/htmledit.gif"
-            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
-            class="net.sourceforge.phpeclipse.wizards.HTMLFileWizard"
-            id="net.sourceforge.phpeclipse.wizards.HTMLFileWizard">
-         <description>
-            Create a basic HTML file.
-         </description>
-      </wizard>
+	  <wizard
+			name="%newWizardPHPFile.name"
+			icon="icons/obj16/phpedit.gif"
+			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+			class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
+			id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
+		 <description>
+			Create a basic PHP file.
+		 </description>
+	  </wizard>
+	  <wizard
+			name="%newWizardHTMLFile.name"
+			icon="icons/obj16/htmledit.gif"
+			category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+			class="net.sourceforge.phpeclipse.wizards.HTMLFileWizard"
+			id="net.sourceforge.phpeclipse.wizards.HTMLFileWizard">
+		 <description>
+			Create a basic HTML file.
+		 </description>
+	  </wizard>
    </extension>
    <extension point="org.eclipse.ui.exportWizards">
-     <wizard name="%ExportWizards.Obfuscator" 
-             icon="icons/ctool16/exportdir_wiz.gif" 
-             class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard" 
-             id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard">
-     <description>%ExportWizards.ObfuscatorDescription</description> 
-     <selection class="org.eclipse.core.resources.IResource" /> 
-     </wizard>
+	 <wizard name="%ExportWizards.Obfuscator"
+			 icon="icons/ctool16/exportdir_wiz.gif"
+			 class="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard"
+			 id="net.sourceforge.phpeclipse.obfuscator.export.ObfuscatorExportWizard">
+	 <description>%ExportWizards.ObfuscatorDescription</description>
+	 <selection class="org.eclipse.core.resources.IResource" />
+	 </wizard>
   </extension>
    <extension
-         point="org.eclipse.ui.ide.projectNatureImages">
-      <image
-            icon="icons/obj16/php.gif"
-            natureId="net.sourceforge.phpeclipse.phpnature"
-            id="net.sourceforge.phpeclipse.ProjectNatureImagePHP">
-      </image>
+		 point="org.eclipse.ui.ide.projectNatureImages">
+	  <image
+			icon="icons/ovr16/php_ovr2.gif"
+			natureId="net.sourceforge.phpeclipse.phpnature"
+			id="net.sourceforge.phpeclipse.ProjectNatureImagePHP">
+	  </image>
    </extension>
    <extension
-         point="org.eclipse.ui.propertyPages">
-<!--      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%propertyPagePHPProject.name"
-            class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
-            id="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page> 
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="PHP Project Settings"
-            class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-            id="net.sourceforge.phpeclipse.preferences.project.PHPMiscProjectPreferences">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page> -->
-      <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%todoPageName"
-            class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
-            id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page>
-      <page
-            objectClass="net.sourceforge.phpdt.core.IJavaProject"
-            name="%todoPageName"
-            class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
-            id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page>
-            <page
-            objectClass="org.eclipse.core.resources.IProject"
-            name="%compilerPageName"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
-            id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page>
-      <page
-            objectClass="net.sourceforge.phpdt.core.IJavaProject"
-            name="%compilerPageName"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
-            id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage">
-         <filter
-               name="nature"
-               value="net.sourceforge.phpeclipse.phpnature">
-         </filter>
-      </page>
-     <!--  <page
-            objectClass="org.eclipse.core.resources.IFile"
-            name="PHP File Settings"
-            class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-            id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-      </page> -->
+		 point="org.eclipse.ui.propertyPages">
+	  <page
+         class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
+         icon="icons/obj16/php.png"
+         id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage"
+         name="%todoPageName"
+         objectClass="org.eclipse.core.resources.IProject">
+		 <filter
+			   name="nature"
+			   value="net.sourceforge.phpeclipse.phpnature">
+		 </filter>
+	  </page>
+	  <page
+         class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPropertyPage"
+         icon="icons/obj16/php.png"
+         id="net.sourceforge.phpdt.ui.propertyPages.TodoTaskPropertyPage"
+         name="%todoPageName"
+         objectClass="net.sourceforge.phpdt.core.IJavaProject">
+		 <filter
+			   name="nature"
+			   value="net.sourceforge.phpeclipse.phpnature">
+		 </filter>
+	  </page>
+			<page
+         class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+         icon="icons/obj16/php.png"
+         id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage"
+         name="%compilerPageName"
+         objectClass="org.eclipse.core.resources.IProject">
+		 <filter
+			   name="nature"
+			   value="net.sourceforge.phpeclipse.phpnature">
+		 </filter>
+	  </page>
+	  <page
+         class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPropertyPage"
+         icon="icons/obj16/php.png"
+         id="net.sourceforge.phpdt.ui.propertyPages.CompilerPropertyPage"
+         name="%compilerPageName"
+         objectClass="net.sourceforge.phpdt.core.IJavaProject">
+		 <filter
+			   name="nature"
+			   value="net.sourceforge.phpeclipse.phpnature">
+		 </filter>
+	  </page>
    </extension>
-<!--   <extension
-         point="org.eclipse.ui.views">
-      <view
-            name="%viewPHPResources.name"
-            icon="icons/obj16/php.gif"
-            class="net.sourceforge.phpeclipse.resourcesview.PHPResourcesView"
-            id="net.sourceforge.phpeclipse.resourcesview.ViewPHPResources">
-      </view>
-   </extension> -->
    <extension
-         point="org.eclipse.ui.editors">
-      <editor
-            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">
-      </editor>
- <!--     <editor
-            name="%phpEditorName"
-            default="true"
-            icon="icons/obj16/htmledit.gif"
-            extensions="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">
-      </editor> -->
-  <!--    <editor
-            name="%phpEditorName"
-            default="true"
-            icon="icons/obj16/htmledit.gif"
-            extensions="tpl"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
-            symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
-            id="net.sourceforge.phpeclipse.PHPUnitEditor">
-      </editor> -->
+		 point="org.eclipse.ui.editors">
+	  <editor
+			name="%phpEditorName"
+			default="true"
+			icon="icons/obj16/phpedit.gif"
+			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>
    </extension>
-      <extension
-         point="org.eclipse.ui.fontDefinitions">
-      <fontDefinition
-            label="%phpEditorFontDefiniton.label"
-            defaultsTo="org.eclipse.jface.textfont"
-            id="net.sourceforge.phpdt.ui.editors.textfont">
-         <description>
-            %phpEditorFontDefintion.description
-         </description>
-      </fontDefinition>
+	  <extension
+		 point="org.eclipse.ui.fontDefinitions">
+	  <fontDefinition
+			label="%phpEditorFontDefiniton.label"
+			defaultsTo="org.eclipse.jface.textfont"
+			id="net.sourceforge.phpdt.ui.editors.textfont">
+		 <description>
+			%phpEditorFontDefintion.description
+		 </description>
+	  </fontDefinition>
    </extension>
    <extension
-         point="org.eclipse.ui.editors.annotationTypes">
-      <type
-         name="net.sourceforge.phpdt.ui.error"
-         super="org.eclipse.ui.workbench.texteditor.error"
-         markerType="net.sourceforge.phpeclipse.problem"
-         markerSeverity="2">
-      </type>
-      <type
-         name="net.sourceforge.phpdt.ui.warning"
-         super="org.eclipse.ui.workbench.texteditor.warning"
-         markerType="net.sourceforge.phpeclipse.problem"
-         markerSeverity="1">
-      </type>
-      <type
-         name="net.sourceforge.phpdt.ui.info"
-         super="org.eclipse.ui.workbench.texteditor.info"
-         markerType="net.sourceforge.phpeclipse.problem"
-         markerSeverity="0">
-      </type>
-      <type
-         name="net.sourceforge.phpdt.ui.occurrences">
-      </type>
+		 point="org.eclipse.ui.editors.annotationTypes">
+	  <type
+		 name="net.sourceforge.phpdt.ui.error"
+		 super="org.eclipse.ui.workbench.texteditor.error"
+		 markerType="net.sourceforge.phpeclipse.problem"
+		 markerSeverity="2">
+	  </type>
+	  <type
+		 name="net.sourceforge.phpdt.ui.warning"
+		 super="org.eclipse.ui.workbench.texteditor.warning"
+		 markerType="net.sourceforge.phpeclipse.problem"
+		 markerSeverity="1">
+	  </type>
+	  <type
+		 name="net.sourceforge.phpdt.ui.info"
+		 super="org.eclipse.ui.workbench.texteditor.info"
+		 markerType="net.sourceforge.phpeclipse.problem"
+		 markerSeverity="0">
+	  </type>
+	  <type
+		 name="net.sourceforge.phpdt.ui.occurrences">
+	  </type>
    </extension>
    <extension
-         point="org.eclipse.ui.editors.markerAnnotationSpecification">
-      <specification
-            annotationType="net.sourceforge.phpdt.ui.error"
-            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
-      </specification>
-      <specification
-            annotationType="net.sourceforge.phpdt.ui.warning"
-            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
-      </specification>
-      <specification
-            annotationType="net.sourceforge.phpdt.ui.info"
-            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
-      </specification>
-      <specification 
-            annotationType="org.eclipse.debug.core.breakpoint"
-            icon="icons/full/obj16/brkp_obj.gif"
-            annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
-      </specification>
+		 point="org.eclipse.ui.editors.markerAnnotationSpecification">
+	  <specification
+			annotationType="net.sourceforge.phpdt.ui.error"
+			annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+	  </specification>
+	  <specification
+			annotationType="net.sourceforge.phpdt.ui.warning"
+			annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+	  </specification>
+	  <specification
+			annotationType="net.sourceforge.phpdt.ui.info"
+			annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.JavaAnnotationImageProvider">
+	  </specification>
 	  <specification
-            annotationType="net.sourceforge.phpdt.ui.occurrences"
-            label="%OccurrenceAnnotation.label"
-            icon="icons/full/obj16/searchm_obj.gif"
-            textPreferenceKey="occurrenceIndication"
-            textPreferenceValue="false"
-            highlightPreferenceKey="occurrenceHighlighting"
-            highlightPreferenceValue="true"
-            overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler"
-            overviewRulerPreferenceValue="true"
-            verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler"
-            verticalRulerPreferenceValue="false"
-            colorPreferenceKey="occurrenceIndicationColor"
-            colorPreferenceValue="180,207,205"
-            presentationLayer="3"
-            showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction"
-            showInNextPrevDropdownToolbarAction="true"
-            isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget"
-	        isGoToNextNavigationTarget="false"
-            isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget"
-	        isGoToPreviousNavigationTarget="false">
+			annotationType="org.eclipse.debug.core.breakpoint"
+			icon="icons/full/obj16/brkp_obj.gif"
+			annotationImageProvider="net.sourceforge.phpeclipse.phpeditor.BreakpointImageProvider">
 	  </specification>
-    </extension>
-    
+	  <specification
+			annotationType="net.sourceforge.phpdt.ui.occurrences"
+			label="%OccurrenceAnnotation.label"
+			icon="icons/obj16/searchm_obj.gif"
+			textPreferenceKey="occurrenceIndication"
+			textPreferenceValue="false"
+			highlightPreferenceKey="occurrenceHighlighting"
+			highlightPreferenceValue="true"
+			overviewRulerPreferenceKey="occurrenceIndicationInOverviewRuler"
+			overviewRulerPreferenceValue="true"
+			verticalRulerPreferenceKey="occurrenceIndicationInVerticalRuler"
+			verticalRulerPreferenceValue="false"
+			colorPreferenceKey="occurrenceIndicationColor"
+			colorPreferenceValue="180,207,205"
+			presentationLayer="3"
+			showInNextPrevDropdownToolbarActionKey="showOccurrenceInNextPrevDropdownToolbarAction"
+			showInNextPrevDropdownToolbarAction="true"
+			isGoToNextNavigationTargetKey="isOccurrenceGoToNextNavigationTarget"
+			isGoToNextNavigationTarget="false"
+			isGoToPreviousNavigationTargetKey="isOccurrenceGoToPreviousNavigationTarget"
+			isGoToPreviousNavigationTarget="false">
+	  </specification>
+	</extension>
+
    <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%CodingActionSet.label"
-            description="%CodingActionSet.description"
-            visible="false"
-            id="net.sourceforge.phpeclipse.ui.CodingActionSet">   
+		 point="org.eclipse.ui.actionSets">
+	  <actionSet
+			label="%CodingActionSet.label"
+			description="%CodingActionSet.description"
+			visible="false"
+			id="net.sourceforge.phpeclipse.ui.CodingActionSet">
 <!-- =========================================================================== -->
 <!-- Source Menu                                                                 -->
 <!-- =========================================================================== -->
-         <menu
-               label="%SourceMenu.label"
-               path="edit/editEnd"
-               id="net.sourceforge.phpeclipse.ui.source.menu">
-         	<separator 
-         	      name="editGroup">
-         	</separator>
-            <separator
-                  name="convertGroup">
-            </separator>
-         </menu>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.format"
-               label="%FormatAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.Format">
-         </action>
-         <action
-               label="%ShiftLeftAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.ShiftLeft">
-         </action>
-         <action
-               label="%ShiftRightAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
-               label="%RemoveBlockCommentAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
-               label="%AddBlockCommentAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
-         </action> 
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-               label="%ToggleCommentAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.ui.actions.ToggleComment">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
-               label="%UncommentAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
-               label="%CommentAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.Comment">
-         </action>
-<!-- convert group -->
-         <menu
-               label="%ConvertLineDelimitersActions.label"
-               path="edit/net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
-               id="convertSubMenu">
-            <separator
-                  name="group1">
-            </separator>
-         </menu>
-         <action
-               label="%ConvertLineDelimitersToMacAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToMac">
-         </action>
-         <action
-               label="%ConvertLineDelimitersToUNIXAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToUNIX">
-         </action>
-         <action
-               label="%ConvertLineDelimitersToWindowsAction.label"
-               retarget="true"
-               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
-         </action>
-      </actionSet>
+		 <menu
+			   label="%SourceMenu.label"
+			   path="edit/editEnd"
+			   id="net.sourceforge.phpeclipse.ui.source.menu">
+			 <separator
+				   name="editGroup">
+			 </separator>
+		 </menu>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.format"
+			   label="%FormatAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.phpeditor.Format">
+		 </action>
+		 <action
+			   label="%ShiftLeftAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.phpeditor.ShiftLeft">
+		 </action>
+		 <action
+			   label="%ShiftRightAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
+		 </action>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+			   label="%RemoveBlockCommentAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
+		 </action>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+			   label="%AddBlockCommentAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.ui.actions.AddBlockComment">
+		 </action>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			   label="%ToggleCommentAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.ui.actions.ToggleComment">
+		 </action>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
+			   label="%UncommentAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
+		 </action>
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
+			   label="%CommentAction.label"
+			   retarget="true"
+			   menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+			   id="net.sourceforge.phpeclipse.phpeditor.Comment">
+		 </action>
+	  </actionSet>
    </extension>
    <extension
-         point="org.eclipse.ui.actionSetPartAssociations">
-      <actionSetPartAssociation
-            targetID="net.sourceforge.phpeclipse.ui.CodingActionSet">
-         <part id="net.sourceforge.phpeclipse.PHPUnitEditor" />
-      </actionSetPartAssociation>
+		 point="org.eclipse.ui.actionSetPartAssociations">
+	  <actionSetPartAssociation
+			targetID="net.sourceforge.phpeclipse.ui.CodingActionSet">
+		 <part id="net.sourceforge.phpeclipse.PHPUnitEditor" />
+	  </actionSetPartAssociation>
    </extension>
-   
+
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
-<!--   <extension
-         point="org.eclipse.ui.actionDefinitions">
- 
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
-      </actionDefinition>
- 
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.Comment">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.Uncomment">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.Format">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.next.problem">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
-      </actionDefinition>
-   </extension> -->
-<!--   <extension
-         point="org.eclipse.ui.acceleratorSets">
-      <acceleratorSet
-            scopeId="org.eclipse.ui.textEditorScope"
-            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-         <accelerator
-               key="Ctrl+/"
-               id="net.sourceforge.phpdt.ui.actions.comment">
-         </accelerator>
-         <accelerator
-               key="Ctrl+\\"
-               id="net.sourceforge.phpdt.ui.actions.uncomment">
-         </accelerator>
-      </acceleratorSet>
-   </extension> -->
-   
+
    <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php3"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php4"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.php5"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.module"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.inc"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.phtml"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.html"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-            <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.htm"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-      <objectContribution
-            objectClass="org.eclipse.core.resources.IFile"
-            nameFilter="*.xml"
-            id="net.sourceforge.phpeclipse.actions.popupShowAction">
-         <action
-               label="Open PHP Browser"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.showAction">
-         </action>
-      </objectContribution>
-  
-  <!--    <viewerContribution  
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
-         <action
-               label="Open Quantum SQL Table View"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.opensqltable">
-         </action>
-      </viewerContribution> -->
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
-         <action
-               label="Insert HTML (dl,ul,ol,table)"
-               class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.wizards.html">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
-         <action
-               label="Open Included Files List"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.openallincludes">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
-         <action
-               label="%OpenDeclaration"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
-               menubarPath="additions"
-               definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
-               id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
-         </action>
-      </viewerContribution>
-      <viewerContribution
-            targetID="#PHPRulerContext"
-            id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
-         <action
-               label="%AddTask.label"
-               helpContextId="org.eclipse.ui.AddTask_action_context"
-               class="org.eclipse.ui.texteditor.TaskRulerAction"
-               menubarPath="add"
-               id="org.eclipse.ui.texteditor.TaskRulerAction">
-         </action>
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               menubarPath="add"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-         </action>
-      </viewerContribution>
+		 point="org.eclipse.ui.popupMenus">
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.php"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.php3"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php3">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.php4"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php4">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.php5"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.php5">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.module"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.module">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.inc"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.inc">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.phtml"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.phtml">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.html"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.html">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+			<objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.htm"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.htm">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+	  <objectContribution
+			objectClass="org.eclipse.core.resources.IFile"
+			nameFilter="*.xml"
+			id="net.sourceforge.phpeclipse.actions.popupShowAction.xml">
+		 <action
+			   label="Open PHP Browser"
+			   class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.showAction">
+		 </action>
+	  </objectContribution>
+
+	  <viewerContribution
+			targetID="#PHPEditorContext"
+			id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
+		 <action
+			   label="Insert HTML (dl,ul,ol,table)"
+			   class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.wizards.html">
+		 </action>
+	  </viewerContribution>
+	  <viewerContribution
+			targetID="#PHPEditorContext"
+			id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
+		 <action
+			   label="Open Included Files List"
+			   class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.actions.openallincludes">
+		 </action>
+	  </viewerContribution>
+	  <viewerContribution
+			targetID="#PHPEditorContext"
+			id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+		 <action
+			   label="%OpenDeclaration"
+			   class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+			   menubarPath="additions"
+			   definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+			   id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
+		 </action>
+	  </viewerContribution>
+	 <viewerContribution
+		targetID="#PHPEditorContext"
+		id="net.sourceforge.phpdt.ltk.renameLocalVariable">
+		<action label="Rename Local Variable in Functions/Methods"
+				class="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"
+				menubarPath="additions"
+				id="net.sourceforge.phpdt.ltk.ui.actions.RenameLocalVariable"/>
+	  </viewerContribution>
+	  <viewerContribution
+			targetID="#PHPRulerContext"
+			id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
+		 <action
+			   label="%AddTask.label"
+			   helpContextId="org.eclipse.ui.AddTask_action_context"
+			   class="org.eclipse.ui.texteditor.TaskRulerAction"
+			   menubarPath="add"
+			   id="org.eclipse.ui.texteditor.TaskRulerAction">
+		 </action>
+		 <action
+			   label="%AddBookmark.label"
+			   helpContextId="org.eclipse.ui.bookmark_action_context"
+			   class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			   menubarPath="add"
+			   id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		 </action>
+	  </viewerContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="%OpenActionSet.label"
-            description="%OpenActionSet.description"
-            visible="false"
-            id="net.sourceforge.phpeclipse.ui.A_OpenActionSet">
-         <action
-               definitionId="net.sourceforge.phpeclipse.ui.edit.text.java.open.editor"
-               label="%OpenDeclaration"
-               tooltip="%OpenDeclaration"
-               retarget="true"
-               menubarPath="navigate/open.ext" 
-               allowLabelUpdate="true"
-               id="net.sourceforge.phpeclipse.ui.actions.Open">
-         </action>
-      </actionSet>
-   </extension> 
+		 point="org.eclipse.ui.actionSets">
+	  <actionSet
+			label="%OpenActionSet.label"
+			description="%OpenActionSet.description"
+			visible="false"
+			id="net.sourceforge.phpeclipse.ui.A_OpenActionSet">
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.ui.edit.text.java.open.editor"
+			   label="%OpenDeclaration"
+			   tooltip="%OpenDeclaration"
+			   retarget="true"
+			   menubarPath="navigate/open.ext"
+			   allowLabelUpdate="true"
+			   id="net.sourceforge.phpeclipse.ui.actions.Open">
+		 </action>
+	  </actionSet>
+   </extension>
    <extension
-         point="org.eclipse.ui.editorActions">
-      <editorContribution
-            id="org.eclipse.ui.texteditor.ruler.actions"
-            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+		 point="org.eclipse.ui.editorActions">
+	  <editorContribution
+			id="org.eclipse.ui.texteditor.ruler.actions"
+			targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
 		<action
 			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
 			actionID="RulerDoubleClick"
 			label="%Dummy.label"
-            helpContextId="org.eclipse.ui.bookmark_action_context"
+			helpContextId="org.eclipse.ui.bookmark_action_context"
 			class="org.eclipse.ui.texteditor.BookmarkRulerAction">
 		</action>
 		<action
-            label="%Dummy.label"
-            class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
-            actionID="RulerClick"
-            id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
-        </action>
-      </editorContribution>
-      <editorContribution
-            id="net.sourceforge.phpdt.editor.actions" 
-            targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
-         <action 
-               definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
-               label="%OpenDeclaration"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
-               id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
-         </action>
-      </editorContribution>   
+			label="%Dummy.label"
+			class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+			actionID="RulerClick"
+			id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction">
+		</action>
+	  </editorContribution>
+	  <editorContribution
+			id="net.sourceforge.phpdt.editor.actions"
+			targetID="net.sourceforge.phpeclipse.PHPUnitEditor">
+		 <action
+			   definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+			   label="%OpenDeclaration"
+			   class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+			   id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
+		 </action>
+	  </editorContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution 
-            targetID="#CompilationUnitRulerContext"
-            id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
-         <action
-               label="%Dummy.label"
-               helpContextId="net.sourceforge.phpeclipse.quick_fix_action"
-               class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
-               menubarPath="additions"
-               id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
-         </action>
-      </viewerContribution>
+		 point="org.eclipse.ui.popupMenus">
+	  <viewerContribution
+			targetID="#CompilationUnitRulerContext"
+			id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
+		 <action
+			   label="%Dummy.label"
+			   helpContextId="net.sourceforge.phpeclipse.quick_fix_action"
+			   class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
+			   menubarPath="additions"
+			   id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
+		 </action>
+	  </viewerContribution>
    </extension>
    <extension
-         point="org.eclipse.ui.popupMenus">
-      <viewerContribution
-            targetID="#CompilationUnitRulerContext"
-            id="net.sourceforge.phpdt.ui.CompilationUnitEditorPopupActions">
-         <action
-               label="%AddTask.label"
-               helpContextId="org.eclipse.ui.AddTask_action_context"
-               tooltip="%AddTask.tooltip"
-               class="org.eclipse.ui.texteditor.TaskRulerAction"
-               menubarPath="add"
-               id="org.eclipse.ui.texteditor.TaskRulerAction">
-         </action>
-         <action
-               label="%AddBookmark.label"
-               helpContextId="org.eclipse.ui.bookmark_action_context"
-               tooltip="%AddBookmark.tooltip"
-               class="org.eclipse.ui.texteditor.BookmarkRulerAction"
-               menubarPath="add"
-               id="org.eclipse.ui.texteditor.BookmarkRulerAction">
-         </action>
-         <menu
+		 point="org.eclipse.ui.popupMenus">
+	  <viewerContribution
+			targetID="#CompilationUnitRulerContext"
+			id="net.sourceforge.phpdt.ui.CompilationUnitEditorPopupActions">
+		 <action
+			   label="%AddTask.label"
+			   helpContextId="org.eclipse.ui.AddTask_action_context"
+			   tooltip="%AddTask.tooltip"
+			   class="org.eclipse.ui.texteditor.TaskRulerAction"
+			   menubarPath="add"
+			   id="org.eclipse.ui.texteditor.TaskRulerAction">
+		 </action>
+		 <action
+			   label="%AddBookmark.label"
+			   helpContextId="org.eclipse.ui.bookmark_action_context"
+			   tooltip="%AddBookmark.tooltip"
+			   class="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			   menubarPath="add"
+			   id="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		 </action>
+		 <menu
 			id="projection"
 			label="%Folding.label"
 			path="rest">
 		 </menu>
-         <action
-               label="%Dummy.label"
-               tooltip="%Dummy.label"
-               class="net.sourceforge.phpdt.internal.ui.actions.FoldingExpandAllRulerAction"
-               menubarPath="projection/additions"
-               definitionId="org.eclipse.ui.edit.text.folding.expand_all"
-               id="net.sourceforge.phpdt.ui.folding.expandAll">
-         </action>
-         <action
-               label="%Dummy.label"
-               tooltip="%Dummy.label"
-               class="net.sourceforge.phpdt.internal.ui.actions.FoldingToggleRulerAction"
-               menubarPath="projection/additions"
-               definitionId="org.eclipse.ui.edit.text.folding.toggle"
-               id="net.sourceforge.phpdt.ui.folding.toggle">
-         </action>
-      </viewerContribution>
+		 <action
+			   label="%Dummy.label"
+			   tooltip="%Dummy.label"
+			   class="net.sourceforge.phpdt.internal.ui.actions.FoldingExpandAllRulerAction"
+			   menubarPath="projection/additions"
+			   definitionId="org.eclipse.ui.edit.text.folding.expand_all"
+			   id="net.sourceforge.phpdt.ui.folding.expandAll">
+		 </action>
+		 <action
+			   label="%Dummy.label"
+			   tooltip="%Dummy.label"
+			   class="net.sourceforge.phpdt.internal.ui.actions.FoldingToggleRulerAction"
+			   menubarPath="projection/additions"
+			   definitionId="org.eclipse.ui.edit.text.folding.toggle"
+			   id="net.sourceforge.phpdt.ui.folding.toggle">
+		 </action>
+	  </viewerContribution>
    </extension>
  <!-- =========================================================================== -->
 <!-- PHPDT/UI command definitions                                                   -->
 <!-- =========================================================================== -->
    <extension point="org.eclipse.ui.contexts">
-      <context name="%context.editingPHPSource.name" 
-       description="%context.editingPHPSource.description" 
-       parentId="org.eclipse.ui.textEditorScope" 
-       id="net.sourceforge.phpdt.ui.phpEditorScope" /> 
+	  <context name="%context.editingPHPSource.name"
+	   description="%context.editingPHPSource.description"
+	   parentId="org.eclipse.ui.textEditorScope"
+	   id="net.sourceforge.phpdt.ui.phpEditorScope" />
    </extension>
    <extension
-         point="org.eclipse.ui.commands">
-      <category
-            name="%category.source.name"
-            description="%category.source.description"
-            id="net.sourceforge.phpeclipse.ui.category.source">
-      </category>
-      
+		 point="org.eclipse.ui.commands">
+	  <category
+			name="%category.source.name"
+			description="%category.source.description"
+			id="net.sourceforge.phpeclipse.ui.category.source">
+	  </category>
+
  <!-- source -->
-      <command
-            name="%ActionDefinition.comment.name"
-            description="%ActionDefinition.comment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.comment">
-      </command>
-      <command
-            name="%ActionDefinition.uncomment.name"
-            description="%ActionDefinition.uncomment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-      </command>
-      <command 
-            name="%ActionDefinition.toggleComment.name"
-            description="%ActionDefinition.toggleComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
-      </command>
-      
-      <keyBinding
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            string="Ctrl+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            string="Ctrl+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+7"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Ctrl+Shift+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Esc Ctrl+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%ActionDefinition.addBlockComment.name"
-            description="%ActionDefinition.addBlockComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.add.block.comment">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+/"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%ActionDefinition.removeBlockComment.name"
-            description="%ActionDefinition.removeBlockComment.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.remove.block.comment">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+\"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%ActionDefinition.indent.name"
-            description="%ActionDefinition.indent.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.indent">
-      </command>
-      <keyBinding
-            string="Ctrl+I"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.indent"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-       
-      <command
-            name="%ActionDefinition.format.name"
-            description="%ActionDefinition.format.description"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.phpeditor.format">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Ctrl+Shift+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="gtk"
-            string="Esc Ctrl+F"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.phpeditor.format"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      
-      <!-- navigate -->
-      <command
-            name="%ActionDefinition.gotoNextMember.name"
-            description="%ActionDefinition.gotoNextMember.description"
-            category="org.eclipse.ui.category.navigate"
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+ARROW_DOWN"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%ActionDefinition.gotoPreviousMember.name"
-            description="%ActionDefinition.gotoPreviousMember.description"
-            category="org.eclipse.ui.category.navigate"
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+ARROW_UP"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            string=""
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpdt.ui.edit.text.java.show.next.problem"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%ActionDefinition.gotoMatchingBracket.name"
-            description="%ActionDefinition.gotoMatchingBracket.description"
-            category="org.eclipse.ui.category.navigate"
-            id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
-      </command>
-      <keyBinding
-            string="Ctrl+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Ctrl+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <keyBinding
-            platform="carbon"
-            string="Command+Shift+P"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
-      <command
-            name="%OpenDeclaration" 
-            description="%OpenDeclaration"
-            category="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpeclipse.actions.opendeclaration">
-      </command>
-      <keyBinding
-            string="F3"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.actions.opendeclaration"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding> 
-   </extension>  
-   <extension
-         id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
-         name="%javaDocumentSetupParticipant"
-         point="org.eclipse.core.filebuffers.documentSetup"> 
-      <participant
-            extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
-            class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
-      </participant>
-   <!--   <participant
-            extensions="html,xml"
-            class="net.sourceforge.phpeclipse.phpeditor.HTMLDocumentSetupParticipant">
-      </participant>
-      <participant
-            extensions="tpl"
-            class="net.sourceforge.phpeclipse.phpeditor.SmartyDocumentSetupParticipant">
-      </participant> -->
-   </extension>
-   <extension
-         id="net.sourceforge.phpeclipse.JavaDocumentFactory"
-         name="%javaDocumentFactory"
-         point="org.eclipse.core.filebuffers.documentCreation">
-      <factory
-            extensions="php,php3,php4,php5,phtml,inc,module,htm,html,xhtml"
-            class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
-      </factory>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.preferencePages">
-   <!--     <page
-            name="PHP"
-            category="net.sourceforge.phpeclipse.ui.preferencePage"
-            class="net.sourceforge.phpeclipse.PHPEclipseBasePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
-      </page> -->
-      <page name="PHP"
-            category="net.sourceforge.phpeclipse.ui.preferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
-            id="net.sourceforge.phpeclipse.preferences.PHPPreferencePage">
-      </page>
-      <page
-            name="Code Templates"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
-      </page>
-  <!--    <page
-            name="Members Sort Order"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.MembersOrderPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.MembersOrderPreferencePage">
-      </page> 
-      <page
-            name="PHP External Parser Command"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
-            id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
-      </page>
-     <page
-            name="Editor2"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpeclipse.PHPSyntaxEditorPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPSyntaxEditorPreferencePage">
-      </page> 
-      <page
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            name="PHP Project Defaults"
-            class="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences"
-            id="net.sourceforge.phpeclipse.preferences.PHPMiscProjectPreferences">
-      </page> 
-      <page
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            name="PHP Browser Preview"
-            class="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences"
-            id="net.sourceforge.phpeclipse.preferences.PHPPreviewProjectPreferences">
-      </page> -->
-      <page
-            name="%compilerOptionsPrefName" 
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
-      </page>
-      <page
-            name="%todoTaskPrefName" 
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
-      </page>
-      <page
-            name="Formatter"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
-      </page>
-      <page name="%codeAssistPageName"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
-            id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
-      </page>
-            <page
-            name="%templatePageName"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
-      </page>
-  <!--      <page
-            name="%templatePageName"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
-      </page>
-      <page
-            name="Language Settings"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page> -->
-      <page 
-            name="%spellingPrefName"
-            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
-            id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
-      </page> 
-   </extension>
- <!--  <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="php,php3,php4,php5,phtml,inc,module,html,htm,xhtml"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%php3FileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%php4FileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%php5FileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%moduleFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
+	  <command
+			name="%ActionDefinition.comment.name"
+			description="%ActionDefinition.comment.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.comment">
+	  </command>
+	  <command
+			name="%ActionDefinition.uncomment.name"
+			description="%ActionDefinition.uncomment.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+	  </command>
+	  <command
+			name="%ActionDefinition.toggleComment.name"
+			description="%ActionDefinition.toggleComment.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.toggle.comment">
+	  </command>
+
+	  <command
+			name="%ActionDefinition.addBlockComment.name"
+			description="%ActionDefinition.addBlockComment.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.add.block.comment">
+	  </command>
+	  <command
+			name="%ActionDefinition.removeBlockComment.name"
+			description="%ActionDefinition.removeBlockComment.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.remove.block.comment">
+	  </command>
+	  <command
+			name="%ActionDefinition.indent.name"
+			description="%ActionDefinition.indent.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.indent">
+	  </command>
+	  <command
+			name="%ActionDefinition.format.name"
+			description="%ActionDefinition.format.description"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.phpeditor.format">
+	  </command>
+
+	  <!-- navigate -->
+	  <command
+			name="%ActionDefinition.gotoNextMember.name"
+			description="%ActionDefinition.gotoNextMember.description"
+			categoryId="org.eclipse.ui.category.navigate"
+			id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member">
+	  </command>
+	  <command
+			name="%ActionDefinition.gotoPreviousMember.name"
+			description="%ActionDefinition.gotoPreviousMember.description"
+			categoryId="org.eclipse.ui.category.navigate"
+			id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member">
+	  </command>
+	  <command
+			name="%ActionDefinition.gotoMatchingBracket.name"
+			description="%ActionDefinition.gotoMatchingBracket.description"
+			categoryId="org.eclipse.ui.category.navigate"
+			id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
+	  </command>
+	  <command
+			name="%OpenDeclaration"
+			description="%OpenDeclaration"
+			categoryId="net.sourceforge.phpeclipse.ui.category.source"
+			id="net.sourceforge.phpeclipse.actions.opendeclaration">
+	  </command>
    </extension>
    <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%incFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
+		 id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
+		 name="%javaDocumentSetupParticipant"
+		 point="org.eclipse.core.filebuffers.documentSetup">
+	  <participant
+			contentTypeId="net.sourceforge.phpeclipse.phpSource"
+			class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
+	  </participant>
    </extension>
    <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%phtmlFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension>
-  <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%htmlFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
+		 id="net.sourceforge.phpeclipse.JavaDocumentFactory"
+		 name="%javaDocumentFactory"
+		 point="org.eclipse.core.filebuffers.documentCreation">
+	  <factory
+			contentTypeId="net.sourceforge.phpeclipse.phpSource"
+			class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentFactory">
+	  </factory>
    </extension>
+
    <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%htmFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
+		 point="org.eclipse.ui.preferencePages">
+	  <page name="PHP"
+			category="net.sourceforge.phpeclipse.ui.preferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+			id="net.sourceforge.phpeclipse.preferences.PHPPreferencePage">
+	  </page>
+	  <page
+			name="Code Templates"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
+			id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
+	  </page>
+	  <page
+			name="%compilerOptionsPrefName"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.CompilerPreferencePage"
+			id="net.sourceforge.phpeclipse.preference.CompilerPreferencePage">
+	  </page>
+	  <page
+			name="%todoTaskPrefName"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.TodoTaskPreferencePage"
+			id="net.sourceforge.phpeclipse.preference.TodoTaskPreferencePage">
+	  </page>
+	  <page
+			name="Formatter"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
+			id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
+	  </page>
+	  <page name="%codeAssistPageName"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
+			id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
+	  </page>
+			<page
+			name="%templatePageName"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+			id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+	  </page>
+	  <page
+			name="%spellingPrefName"
+			category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+			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">
+	  </page>
    </extension>
-   <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="xhtml"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension> -->
- <!--  <extension
-         point="org.eclipse.ui.editors.documentProviders">
-      <provider
-            extensions="%tplFileExtension"
-            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
-            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
-      </provider>
-   </extension> 
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            name="%viewCategoryName"
-            id="net.sourceforge.phpeclipse.views.category">
-      </category>
-      <view
-            name="%phpConsoleView"
-            icon="icons/obj16/php.gif"
-            category="net.sourceforge.phpeclipse.views.category"
-            class="net.sourceforge.phpeclipse.views.PHPConsole"
-            id="net.sourceforge.phpeclipse.views.phpconsoleview">
-      </view>  
-   </extension> -->
 
 <!-- external tools -->
-
 <!-- extension point definitions -->
 	<extension-point id="configurationDuplicationMaps" name="%ExtPoint.configurationDuplicationMaps"/>
 	<extension-point id="argumentVariables" name="%ExtPoint.argumentVariables"/>
 	<extension-point id="directoryVariables" name="%ExtPoint.directoryVariables"/>
 	<extension-point id="fileVariables" name="%ExtPoint.fileVariables"/>
 	<extension-point id="refreshVariables" name="%ExtPoint.refreshVariables"/>
-	
-<!-- Extensions -->
-	<extension point="org.eclipse.ui.actionSets">
-		<actionSet
-			id="net.sourceforge.phpdt.externaltools.ExternalToolsSet"
-			label="%ActionSet.externalTools"
-			visible="true">
-			<menu id="org.eclipse.ui.run" 
-				label="%Menu.run" 
-				path="additions"> 
-				<separator name="ExternalToolsGroup"/> 
-			</menu> 
-	<!--		<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateMenu"
-				label="%Action.externalTools"
-				menubarPath="org.eclipse.ui.run/ExternalToolsGroup"
-				disabledIcon="icons/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> 
-			<action
-				id="net.sourceforge.phpdt.externaltools.ExternalToolMenuDelegateToolbar"
-				label="%Action.externalTools"
-				toolbarPath="Normal/additions"
-				disabledIcon="icons/externaltools/full/dtool16/external_tools.gif"
-				icon="icons/externaltools/full/etool16/external_tools.gif"
-				hoverIcon="icons/externaltools/full/ctool16/external_tools.gif"
-				tooltip="%Action.externalToolsTip"
-				pulldown="true"
-				class="net.sourceforge.phpdt.externaltools.internal.menu.ExternalToolMenuDelegate">
-			</action> -->
-		</actionSet>
-	</extension>
-
-    <!-- Launch Configuration Extensions -->
-    <extension point="org.eclipse.debug.core.launchConfigurationTypes">
-    	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-    		name = "%Program.externalTools"
-    		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
-    		modes = "run"
-    		category = "org.eclipse.ui.externaltools">
-    	</launchConfigurationType>
-    	<launchConfigurationType
-	    	id = "net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
-    		name = "%Program.externalTools"
-    		delegate = "net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramLaunchDelegate"
-    		modes = "run"
-    		category = "org.eclipse.ui.externaltools.builder">
-    	</launchConfigurationType>
-    </extension>
-    
-    <extension point = "net.sourceforge.phpeclipse.configurationDuplicationMaps">
-    	<configurationMap
-    		sourceType="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-    		builderType="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType">
-    	</configurationMap>
-    </extension>
-    
-    <extension point = "org.eclipse.debug.ui.launchConfigurationTabGroups">
-		<launchConfigurationTabGroup
-			id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program"
-			type ="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-			class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramTabGroup">
-		</launchConfigurationTabGroup>
-		<launchConfigurationTabGroup
-			id="net.sourceforge.phpdt.externaltools.launchConfigurationTabGroup.program.builder"
-			type ="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
-			class="net.sourceforge.phpdt.externaltools.internal.program.launchConfigurations.ProgramBuilderTabGroup">
-		</launchConfigurationTabGroup>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-		<launchConfigurationTypeImage
-			id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program"
-			configTypeID="net.sourceforge.phpdt.externaltools.ProgramLaunchConfigurationType"
-			icon="icons/externaltools/full/obj16/external_tools.gif">
-		</launchConfigurationTypeImage>	
-		<launchConfigurationTypeImage
-			id="net.sourceforge.phpdt.externaltools.launchConfigurationTypeImage.program.builder"
-			configTypeID="net.sourceforge.phpdt.externaltools.ProgramBuilderLaunchConfigurationType"
-			icon="icons/externaltools/full/obj16/external_tools.gif">
-		</launchConfigurationTypeImage>	
-	</extension>
-
-	<!-- Variable Extensions -->
-	<extension point="net.sourceforge.phpeclipse.fileVariables">
-		<variable
-			tag="workspace_loc"
-			description="Expands to the workspace root's absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-		</variable>
-		<variable
-			tag="resource_loc"
-			description="Expands to the resource's absolute file system path."
-			componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-		</variable>
-	</extension>
-	
-	<extension point="net.sourceforge.phpeclipse.argumentVariables">
-		<variable
-			tag="workspace_loc"
-			description="Expands to the workspace root's absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-		</variable>
-		<variable
-			tag="file_loc"
-			description="Expands to the full file name"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.FileExpander">
-		</variable>
-		<variable
-			tag="file_url"
-			description="Expands to an URL with the localhost preference settings"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.UrlExpander">
-		</variable>
-		<variable
-			tag="localhost_url"
-			description="Expands to the localhost preference settings."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.LocalhostExpander">
-		</variable>
-		<variable
-			tag="project_loc"
-			description="Expands to the selected resource's project absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-		</variable>
-		<variable
-			tag="project_path"
-			description="Expands to the full path, relative to the workspace root, of the selected project"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectExpander">
-		</variable>
-		<variable
-			tag="project_name"
-			description="Expands to the name of the selected project"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ProjectNameExpander">
-		</variable>
-		<variable
-			tag="resource_loc"
-			description="Expands to the resource's absolute file system path."
-			componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFileResourceComponent"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-		</variable>
-		<variable
-			tag="container_loc"
-			description="Expands to the selected resource's containing folder absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-		</variable>
-		<variable
-			tag="build_type"
-			description="Expands to the type of build"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.BuildTypeExpander">
-		</variable>
-	</extension>
 
-	<extension point="net.sourceforge.phpeclipse.directoryVariables">
-		<variable
-			tag="workspace_loc"
-			description="Expands to the workspace root's absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-		</variable>
-		<variable
-			tag="project_loc"
-			description="Expands to the selected resource's project absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-		</variable>
-		<variable
-			tag="container_loc"
-			description="Expands to the selected resource's containing folder absolute file system path."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-		</variable>
-		<variable
-			tag="resource_loc"
-			description="Expands to a resource's absolute file system path."
-			componentClass="net.sourceforge.phpdt.externaltools.variable.SpecificFolderResourceComponent"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-		</variable>
-	</extension>
+<!-- Extensions -->
 
-	<extension point="net.sourceforge.phpeclipse.refreshVariables">
-		<variable
-			tag="workspace"
-			description="Expands to the workspace root."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkspaceExpander">
-		</variable>
-		<variable
-			tag="project"
-			description="Expands to the project of the selected resource."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceProjectExpander">
-		</variable>
-		<variable
-			tag="container"
-			description="Expands to the folder containing the selected resource."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceContainerExpander">
-		</variable>
-		<variable
-			tag="resource"
-			description="Expands to a resource."
-			componentClass="net.sourceforge.phpdt.externaltools.variable.ResourceComponent"
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.ResourceExpander">
-		</variable>
-		<variable
-			tag="working_set"
-			description="Expands to the group of resources in a working set."
-			expanderClass="net.sourceforge.phpdt.externaltools.variable.WorkingSetExpander">
-		</variable>
-	</extension>
-	
-		<extension
+	<extension
 		point= "net.sourceforge.phpeclipse.foldingStructureProviders">
 		<provider
 			id="net.sourceforge.phpdt.ui.text.defaultFoldingProvider"
@@ -1717,50 +913,273 @@
 			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
 		</provider>
 	</extension>
-	
+
 <!-- =========================================================================== -->
 <!-- Filter Support                                                              -->
 <!-- =========================================================================== -->
    <extension
-         point="net.sourceforge.phpeclipse.phpElementFilters">
+		 point="net.sourceforge.phpeclipse.phpElementFilters">
 <!-- Outline Page -->
-      <filter
-            targetId="net.sourceforge.phpeclipse.JavaOutlinePage"
-            name="%HideImportDeclaration.label"
-            enabled="false"
-            description="%HideImportDeclaration.description"
-            class="net.sourceforge.phpdt.internal.ui.filters.ImportDeclarationFilter"
-            id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter">
-      </filter>
+	  <filter
+			targetId="net.sourceforge.phpeclipse.JavaOutlinePage"
+			name="%HideImportDeclaration.label"
+			enabled="false"
+			description="%HideImportDeclaration.description"
+			class="net.sourceforge.phpdt.internal.ui.filters.ImportDeclarationFilter"
+			id="net.sourceforge.phpeclipse.JavaOutlinePage.ImportDeclarationFilter">
+	  </filter>
    </extension>
-   
+
 <!-- =========================================================================== -->
 <!-- Templates                                                                   -->
 <!-- =========================================================================== -->
    <extension
-         point="org.eclipse.ui.editors.templates">
-      <contextType
-            name="%templates.php.contextType.name"
-            class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType"
-            id="java">
-      </contextType>
-      <contextType
-            name="%templates.phpdoc.contextType.name"
-            class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType"
-            id="javadoc">
-      </contextType>
-      <contextType
-            name="%templates.html.contextType.name"
-            class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType"
-            id="javadoc">
-      </contextType>
-      <include
-      		file="templates/default-templates.xml"
-      		translations="templates/default-templates.properties">
-      </include>
-      <include
-      		file="templates/default-codetemplates.xml"
-      		translations="templates/default-templates.properties">
-      </include>
+		 point="org.eclipse.ui.editors.templates">
+	  <contextType
+			name="%templates.php.contextType.name"
+			class="net.sourceforge.phpdt.internal.corext.template.php.JavaContextType"
+			id="java">
+	  </contextType>
+	  <contextType
+			name="%templates.phpdoc.contextType.name"
+			class="net.sourceforge.phpdt.internal.corext.template.php.JavaDocContextType"
+			id="javadoc">
+	  </contextType>
+	  <contextType
+			name="%templates.html.contextType.name"
+			class="net.sourceforge.phpdt.internal.corext.template.php.HTMLContextType"
+			id="javadoc">
+	  </contextType>
+	  <include
+			  file="templates/default-templates.xml"
+			  translations="templates/default-templates.properties">
+	  </include>
+	  <include
+			  file="templates/default-codetemplates.xml"
+			  translations="templates/default-templates.properties">
+	  </include>
+   </extension>
+   <extension
+		 point="org.eclipse.ui.bindings">
+	  <key
+			sequence="Ctrl+Shift+C"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			   sequence="Ctrl+7"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+C"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+C"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+7"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+7"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="gtk"
+			sequence="Ctrl+Shift+C"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="gtk"
+			sequence="Esc Ctrl+C"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+/"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+\"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+\"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+\"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+I"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.indent"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+F"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.format"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+F"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+F"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.format"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="gtk"
+			sequence="Ctrl+Shift+F"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="gtk"
+			sequence="Esc Ctrl+F"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.phpeditor.format"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+ARROW_DOWN"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+ARROW_DOWN"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+ARROW_DOWN"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.next.member"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+ARROW_UP"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+ARROW_UP"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+ARROW_UP"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.previous.member"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="Ctrl+Shift+P"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Ctrl+Shift+P"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId=""
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			platform="carbon"
+			sequence="Command+Shift+P"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
+	  <key
+			sequence="F3"
+			contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+			commandId="net.sourceforge.phpeclipse.actions.opendeclaration"
+			schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+	  </key>
    </extension>
 </plugin>