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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 2508d8a..9fea8e5 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -151,6 +151,10 @@
       </fileTypes>
       <fileTypes
             type="text"
+            extension="php5">
+      </fileTypes>
+      <fileTypes
+            type="text"
             extension="inc">
       </fileTypes>
       <fileTypes
@@ -193,9 +197,12 @@
          label="%sourceHover"
          description="%sourceHoverDescription">
    </hover>
-</extension>
-   <extension
-      point="net.sourceforge.phpeclipse.phpEditorTextHovers">
+   <hover
+            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"
@@ -394,6 +401,16 @@
             name="%phpEditorName"
             default="true"
             icon="icons/obj16/phpedit.gif"
+            extensions="php5"
+            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/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.CompilationUnitEditorActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor"
@@ -842,6 +859,17 @@
       </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="*.inc"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
@@ -1037,8 +1065,14 @@
       </viewerContribution>
    </extension>
  <!-- =========================================================================== -->
-<!-- JDT/UI command definitions                                                   -->
+<!-- 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" /> 
+   </extension>
    <extension
          point="org.eclipse.ui.commands">
       <category
@@ -1046,18 +1080,6 @@
             description="%category.source.description"
             id="net.sourceforge.phpeclipse.ui.category.source">
       </category>
-      <command
-            name="%ActionDefinition.showJavadoc.name"
-            description="%ActionDefinition.showJavadoc.description"
-            category="org.eclipse.ui.category.edit"
-            id="net.sourceforge.phpeclipse.show.javadoc">
-      </command>
-      <keyBinding
-            string="F2"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope"
-            command="net.sourceforge.phpeclipse.show.javadoc"
-            configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </keyBinding>
       
  <!-- source -->
       <command
@@ -1072,7 +1094,7 @@
             category="net.sourceforge.phpeclipse.ui.category.source"
             id="net.sourceforge.phpeclipse.phpeditor.uncomment">
       </command>
-      <command
+      <command 
             name="%ActionDefinition.toggleComment.name"
             description="%ActionDefinition.toggleComment.description"
             category="net.sourceforge.phpeclipse.ui.category.source"
@@ -1085,6 +1107,18 @@
             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"
@@ -1099,6 +1133,34 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
       <keyBinding
+            platform="carbon"
+            string="Ctrl+/"
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
+            command=""
+            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"
@@ -1108,7 +1170,7 @@
       <keyBinding
             platform="gtk"
             string="Esc Ctrl+C"
-            scope="net.sourceforge.phpdt.ui.phpEditorScope" 
+            scope="net.sourceforge.phpdt.ui.phpEditorScope"
             command="net.sourceforge.phpeclipse.phpeditor.toggle.comment"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
@@ -1217,6 +1279,34 @@
             command="net.sourceforge.phpeclipse.phpeditor.format"
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
+      
+      <!-- navigate -->
+      <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>
    </extension>
    <extension
          id="net.sourceforge.phpeclipse.JavaDocumentSetupParticipant"
@@ -1253,10 +1343,10 @@
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
-            name="PHP Parser"
+            name="PHP External Parser Command"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpeclipse.PHPEclipseParserPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPEclipseParserPreferencePage">
+            class="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage"
+            id="net.sourceforge.phpeclipse.preferences.PHPEclipseParserPreferencePage">
       </page>
 <!--    <page
             name="Editor2"
@@ -1307,7 +1397,7 @@
             id="net.sourceforge.phpeclipse.preference.PHPEditorPreferencePage">
       </page> -->
       <page
-            name="Editor 2"
+            name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage"
             id="net.sourceforge.phpdt.internal.ui.preferences.JavaEditorPreferencePage">
@@ -1317,13 +1407,13 @@
             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"
             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">
@@ -1352,6 +1442,14 @@
    <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="%incFileExtension"
             class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
@@ -1419,107 +1517,6 @@
       </view>
    </extension>
 
-<!-- =========================================================================== -->
-<!-- PHPDT/UI Editor Key Bindings -->
-<!-- =========================================================================== -->
-   <extension
-         point="org.eclipse.ui.acceleratorSets">
-      <acceleratorSet
-            scopeId="org.eclipse.ui.textEditorScope"
-            configurationId="org.eclipse.ui.emacsAcceleratorConfiguration">
-<!-- edit -->
-         <accelerator
-               key="Ctrl+Shift+P"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
-         </accelerator>
-         <accelerator
-               key="Ctrl+1"
-               id="org.eclipse.ui.edit.text.contentAssist.proposals">
-         </accelerator>
-<!-- source -->
-         <accelerator
-               key="Ctrl+/"
-               id="net.sourceforge.phpeclipse.phpeditor.comment">
-         </accelerator>
-         <accelerator
-               key="Ctrl+\"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-         </accelerator> 
-         <accelerator
-               key="Ctrl+Shift+F"
-               id="net.sourceforge.phpeclipse.phpeditor.format">
-         </accelerator>
-         <accelerator
-               key="Ctrl+O"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
-         </accelerator>
-         <accelerator
-               key="Ctrl+F3"
-               id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
-         </accelerator>
-      </acceleratorSet>
-      <acceleratorSet
-            scopeId="org.eclipse.ui.textEditorScope"
-            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
-         <accelerator
-               key="Ctrl+Shift+P"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
-         </accelerator>
-         <accelerator
-               key="Ctrl+Space"
-               id="org.eclipse.ui.edit.text.contentAssist.proposals">
-         </accelerator> 
-<!-- source -->
-         <accelerator
-               key="Ctrl+/"
-               id="net.sourceforge.phpeclipse.phpeditor.comment">
-         </accelerator>
-         <accelerator
-               key="Ctrl+\"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-         </accelerator>
-         <accelerator
-               key="Ctrl+Shift+F"
-               id="net.sourceforge.phpeclipse.phpeditor.format">
-         </accelerator>
-         <accelerator
-               key="Ctrl+F3"
-               id="net.sourceforge.phpeclipse.ui.navigate.php.open.structure">
-         </accelerator>
-         <accelerator
-               key="Ctrl+O"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.show.outline">
-         </accelerator>
-      </acceleratorSet>
-      <acceleratorSet
-            scopeId="org.eclipse.ui.textEditorScope"
-            configurationId="org.eclipse.ui.defaultAcceleratorConfiguration">
-<!-- edit -->
-         <accelerator
-               platform="carbon"
-               key="Command+Shift+P"
-               id="net.sourceforge.phpeclipse.ui.edit.text.php.goto.matching.bracket">
-         </accelerator>
-         <accelerator
-               platform="carbon"
-               key="Command+1"
-               id="org.eclipse.ui.edit.text.contentAssist.proposals">
-         </accelerator>
-<!-- source -->
-         <accelerator
-               platform="carbon"
-               key="Command+/"
-               id="net.sourceforge.phpeclipse.phpeditor.comment">
-         </accelerator>
-         <accelerator
-               platform="carbon"
-               key="Command+\"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-         </accelerator> 
-      </acceleratorSet>
-   </extension>
-
 <!-- external tools -->
 
 <!-- extension point definitions -->