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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index fccf33e..5f7ce85 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.1.0"
+   version="1.1.3"
    provider-name="%providerName"
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
     
@@ -11,6 +11,8 @@
       <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"/>
@@ -29,13 +31,16 @@
       <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="net.sourceforge.phpeclipse.quantum.sql"/>  -->
+      <import plugin="com.quantum.Quantum"/> 
       <import plugin="net.sourceforge.phpeclipse.webbrowser"/>
       <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>
 
@@ -92,8 +97,9 @@
     <persistent value="true"/>
 </extension>
 
-   <extension-point id="phpEditorTextHovers" name="%phpEditorTextHoversName" schema="schema/phpEditorTextHovers.exsd"/> 
-   <extension-point id="foldingStructureProviders" name="%foldingStructureProvidersExtensionPoint" schema="schema/foldingStructureProviders.exsd"/>
+<extension-point id="phpElementFilters" name="%elementFiltersName" schema="schema/phpElementFilters.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">
@@ -137,8 +143,7 @@
 		</enablement>
 	</decorator>	
 </extension>
-
-   
+  
    <extension
          point="org.eclipse.team.core.fileTypes">
       <fileTypes
@@ -155,7 +160,7 @@
       </fileTypes>
       <fileTypes
             type="text"
-            extension="php5">
+            extension="php5"> 
       </fileTypes>
       <fileTypes
             type="text"
@@ -169,7 +174,7 @@
             type="text"
             extension="phtml">
       </fileTypes>
-  <!--    <fileTypes
+      <fileTypes
             type="text"
             extension="html">
       </fileTypes>
@@ -179,9 +184,9 @@
       </fileTypes>
       <fileTypes
             type="text"
-            extension="xml">
+            extension="xhtml">
       </fileTypes> 
-      <fileTypes
+  <!--    <fileTypes
             type="text"
             extension="tpl">
       </fileTypes> -->
@@ -229,6 +234,15 @@
       </perspective>
    </extension>
    <extension
+         point="org.eclipse.ui.perspectiveExtensions">
+      <perspectiveExtension
+            targetID="net.sourceforge.phpeclipse.PHPPerspective">
+         <actionSet
+               id="net.sourceforge.phpeclipse.PHPActionSet">
+         </actionSet>
+      </perspectiveExtension>
+   </extension>
+   <extension
          point="org.eclipse.ui.newWizards">
       <category
             name="%newWizardCategory.name"
@@ -277,6 +291,16 @@
             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" 
@@ -379,13 +403,13 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
-            extensions="php"
+            extensions="php,php3,php4,php5,phtml,inc,module"
             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
+ <!--     <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
@@ -444,18 +468,18 @@
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
             symbolicFontName="net.sourceforge.phpdt.ui.editors.textfont"
             id="net.sourceforge.phpeclipse.PHPUnitEditor">
-      </editor>
- <!--     <editor
+      </editor> -->
+      <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/htmledit.gif"
-            extensions="htm" 
+            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
+  <!--    <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/htmledit.gif"
@@ -468,14 +492,14 @@
       <editor
             name="%phpEditorName"
             default="true"
-            icon="icons/obj16/xmledit.gif"
-            extensions="xml"
+            icon="icons/obj16/htmledit.gif"
+            extensions="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
+      </editor> -->
+  <!--    <editor
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/htmledit.gif"
@@ -563,11 +587,12 @@
 	        isGoToPreviousNavigationTarget="false">
 	  </specification>
     </extension>
+    
    <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             label="PHP/Apache"
-            visible="true"
+            visible="false"
             id="net.sourceforge.phpeclipse.PHPActionSet">
          <menu
                label="PHP/Apache"
@@ -612,6 +637,24 @@
                toolbarPath="Normal"
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
+         <action
+               label="Stop XAMPP"
+               icon="icons/obj16/xampp_stop.gif"
+               tooltip="Stop XAMPP"
+               class="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpeclipse.actions.PHPStopXAMPPAction">
+         </action>
+         <action
+               label="Start XAMPP"
+               icon="icons/obj16/xampp_start.gif"
+               tooltip="Start XAMPP"
+               class="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction"
+               menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
+               toolbarPath="Normal"
+               id="net.sourceforge.phpeclipse.actions.PHPStartXAMPPAction">
+         </action>
       </actionSet>
 
       <actionSet
@@ -624,7 +667,7 @@
 <!-- =========================================================================== -->
          <menu
                label="%SourceMenu.label"
-               path="edit"
+               path="edit/editEnd"
                id="net.sourceforge.phpeclipse.ui.source.menu">
          	<separator 
          	      name="editGroup">
@@ -637,60 +680,60 @@
                definitionId="net.sourceforge.phpeclipse.phpeditor.format"
                label="%FormatAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Format">
          </action>
          <action
                label="%ShiftLeftAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.ShiftLeft">
          </action>
          <action
                label="%ShiftRightAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
          </action>
          <action
-               definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+               definitionId="net.sourceforge.phpeclipse.phpeditor.remove.block.comment"
                label="%RemoveBlockCommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
          </action>
          <action
-               definitionId="net.sourceforge.phpeclipse.add.block.comment"
+               definitionId="net.sourceforge.phpeclipse.phpeditor.add.block.comment"
                label="%AddBlockCommentAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               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="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               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="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               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="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/editGroup"
                id="net.sourceforge.phpeclipse.phpeditor.Comment">
          </action>
 <!-- convert group -->
          <menu
                label="%ConvertLineDelimitersActions.label"
-               path="net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
+               path="edit/net.sourceforge.phpeclipse.ui.source.menu/convertGroup"
                id="convertSubMenu">
             <separator
                   name="group1">
@@ -699,21 +742,21 @@
          <action
                label="%ConvertLineDelimitersToMacAction.label"
                retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               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="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               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="net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
+               menubarPath="edit/net.sourceforge.phpeclipse.ui.source.menu/convertSubMenu/group1"
                allowLabelUpdate="true"
                id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
          </action>
@@ -777,7 +820,7 @@
    
    <extension
          point="org.eclipse.ui.popupMenus">
-       <objectContribution
+ <!--      <objectContribution
             objectClass="org.eclipse.core.resources.IProject"
             id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
          <action
@@ -786,7 +829,7 @@
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.actions.PHPDocumentorAction">
          </action>
-      </objectContribution>
+      </objectContribution> -->
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
@@ -963,7 +1006,7 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-            <objectContribution
+      <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.xml"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
@@ -977,45 +1020,45 @@
   
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
+            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
          <action
-               label="Open PHP Declaration"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
+               label="Open Quantum SQL Table View"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.opendeclaration">
+               id="net.sourceforge.phpeclipse.actions.opensqltable">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
+            id="net.sourceforge.phpeclipse.actions.popupHTMLWizard">
          <action
-               label="Open Included Files List"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
+               label="Insert HTML (dl,ul,ol,table)"
+               class="net.sourceforge.phpeclipse.wizards.html.InsertHTMLElementAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.openallincludes">
+               id="net.sourceforge.phpeclipse.actions.wizards.html">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenInclude">
+            id="net.sourceforge.phpeclipse.actions.popupOpenAllIncludes">
          <action
-               label="Open Include File"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenIncludeEditorAction"
+               label="Open Included Files List"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenAllIncludesEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.openinclude">
+               id="net.sourceforge.phpeclipse.actions.openallincludes">
          </action>
       </viewerContribution>
       <viewerContribution
             targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popupOpenSQLTable">
+            id="net.sourceforge.phpeclipse.actions.popupOpenDeclaration">
          <action
-               label="Open Quantum SQL Table View"
-               class="net.sourceforge.phpeclipse.actions.PHPOpenSQLTableEditorAction"
+               label="%OpenDeclaration"
+               class="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.opensqltable">
+               definitionId="net.sourceforge.phpeclipse.actions.opendeclaration"
+               id="net.sourceforge.phpeclipse.actions.PHPOpenDeclarationEditorAction">
          </action>
       </viewerContribution>
-   
       <viewerContribution
             targetID="#PHPRulerContext"
             id="net.sourceforge.phpdt.ui.PHPEditorPopupActions">
@@ -1035,13 +1078,29 @@
          </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> 
    <extension
          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"
@@ -1056,6 +1115,16 @@
             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">
@@ -1064,7 +1133,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.QuickFixRulerMenuAction">
          <action
                label="%Dummy.label"
-               helpContextId="org.eclipse.jdt.ui.quick_fix_action"
+               helpContextId="net.sourceforge.phpeclipse.quick_fix_action"
                class="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerAction"
                menubarPath="additions"
                id="net.sourceforge.phpeclipse.phpeditor.JavaSelectRulerMenuAction">
@@ -1151,6 +1220,7 @@
             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"
@@ -1187,7 +1257,7 @@
             platform="carbon"
             string="Ctrl+/"
             scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command=""
+            command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
       <keyBinding
@@ -1333,6 +1403,64 @@
       
       <!-- 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"
@@ -1358,13 +1486,25 @@
             command="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
-   </extension>
+      <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"
+            extensions="php,php3,php4,php5,module,inc,phtml,html,htm,xhtml"
             class="net.sourceforge.phpeclipse.phpeditor.JavaDocumentSetupParticipant">
       </participant>
    <!--   <participant
@@ -1395,6 +1535,18 @@
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
+            name="Code Templates"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.CodeTemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.CodeTemplatePreferencePage">
+      </page>
+  <!--    <page
+            name="Members Sort Order"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            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.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
@@ -1436,12 +1588,6 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeFormatterPreferencePage"
             id="net.sourceforge.phpeclipse.preference.CodeFormatterPreferencePage">
       </page>
-   <!--    <page
-            name="Editor"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpdt.internal.ui.preferences.PHPEditorPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
-      </page> -->
       <page name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
@@ -1452,34 +1598,40 @@
             class="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage"
             id="net.sourceforge.phpdt.internal.ui.preferences.CodeAssistPreferencePage">
       </page>
-      <page
+            <page
+            name="%templatePageName"
+            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
+            class="net.sourceforge.phpdt.internal.ui.preferences.JavaTemplatePreferencePage"
+            id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
+      </page>
+  <!--      <page
             name="%templatePageName"
             category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
             id="net.sourceforge.phpeclipse.preference.TemplatePreferencePage">
       </page>
- <!--     <page
+      <page
             name="Language Settings"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPLanguagePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPLanguagePreferencePage">
-      </page> 
+      </page> -->
       <page 
             name="%spellingPrefName"
-            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            category="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage"
             id = "net.sourceforge.phpdt.internal.ui.preferences.SpellingPreferencePage">
-      </page>	-->
+      </page> 
    </extension>
    <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
-            extensions="%phpFileExtension"
+            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
+<!--   <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%php3FileExtension"
@@ -1527,7 +1679,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-<!--  <extension
+  <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
             extensions="%htmlFileExtension"
@@ -1546,19 +1698,19 @@
    <extension
          point="org.eclipse.ui.editors.documentProviders">
       <provider
-            extensions="%xmlFileExtension"
+            extensions="xhtml"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
-   </extension>
-   <extension
+   </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> 
    <extension
          point="org.eclipse.ui.views">
       <category
@@ -1572,7 +1724,7 @@
             class="net.sourceforge.phpeclipse.views.PHPConsole"
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>  
-   </extension>
+   </extension> -->
 
 <!-- external tools -->
 
@@ -1799,4 +1951,50 @@
 			preferencesClass="net.sourceforge.phpdt.internal.ui.text.folding.DefaultJavaFoldingPreferenceBlock">
 		</provider>
 	</extension>
+	
+<!-- =========================================================================== -->
+<!-- Filter Support                                                              -->
+<!-- =========================================================================== -->
+   <extension
+         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>
+   </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>
+   </extension>
 </plugin>