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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 4342e98..113bcbc 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -282,8 +282,9 @@
             default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -291,8 +292,9 @@
             default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php3"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -300,8 +302,9 @@
             default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="php4"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -309,8 +312,9 @@
             default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="inc"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -318,17 +322,19 @@
             default="true"
             icon="icons/obj16/phpedit.gif"
             extensions="phtml"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            extensions="htm" 
+            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
@@ -336,8 +342,9 @@
             default="true"
             icon="icons/obj16/htmledit.gif"
             extensions="html"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -345,8 +352,9 @@
             default="true"
             icon="icons/obj16/xmledit.gif"
             extensions="xml"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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
@@ -354,11 +362,23 @@
             default="true"
             icon="icons/obj16/htmledit.gif"
             extensions="tpl"
-            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            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>
    </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>
    <extension
          point="org.eclipse.ui.editors.annotationTypes">
       <type
@@ -477,6 +497,7 @@
       </actionSet>
       <actionSet
             label="%CodingActionSet.label"
+            description="%CodingActionSet.description"
             visible="false"
             id="net.sourceforge.phpeclipse.ui.CodingActionSet">
 <!-- =========================================================================== -->
@@ -486,7 +507,12 @@
                label="%SourceMenu.label"
                path="edit"
                id="net.sourceforge.phpeclipse.ui.source.menu">
-         	<separator name="editGroup" />
+         	<separator 
+         	      name="editGroup">
+         	</separator>
+            <separator
+                  name="convertGroup">
+            </separator>
          </menu>
          <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.format"
@@ -508,6 +534,27 @@
                id="net.sourceforge.phpeclipse.phpeditor.ShiftRight">
          </action>
          <action
+               definitionId="net.sourceforge.phpeclipse.remove.block.comment"
+               label="%RemoveBlockCommentAction.label"
+               retarget="true"
+               menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+               id="net.sourceforge.phpeclipse.ui.actions.RemoveBlockComment">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpeclipse.add.block.comment"
+               label="%AddBlockCommentAction.label"
+               retarget="true"
+               menubarPath="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"
+               id="net.sourceforge.phpeclipse.ui.actions.ToggleComment">
+         </action>
+         <action
                definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
                label="%UncommentAction.label"
                retarget="true"
@@ -521,6 +568,36 @@
                menubarPath="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"
+               id="convertSubMenu">
+            <separator
+                  name="group1">
+            </separator>
+         </menu>
+         <action
+               label="%ConvertLineDelimitersToMacAction.label"
+               retarget="true"
+               menubarPath="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"
+               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"
+               allowLabelUpdate="true"
+               id="net.sourceforge.phpeclipse.ui.actions.ConvertLineDelimitersToWindows">
+         </action>
       </actionSet>
    </extension>
    <extension
@@ -533,13 +610,13 @@
 <!-- =========================================================================== -->
 <!-- PHP Editor Action Definition IDs -->
 <!-- =========================================================================== -->
-   <extension
+<!--   <extension
          point="org.eclipse.ui.actionDefinitions">
-<!-- edit -->
+ 
       <actionDefinition
             id="net.sourceforge.phpeclipse.phpeditor.ContentAssistProposal">
       </actionDefinition>
-<!-- source -->
+ 
       <actionDefinition
             id="net.sourceforge.phpeclipse.phpeditor.Comment">
       </actionDefinition>
@@ -561,7 +638,7 @@
       <actionDefinition
             id="net.sourceforge.phpeclipse.ui.edit.text.php.show.previous.problem">
       </actionDefinition>
-   </extension>
+   </extension> -->
 <!--   <extension
          point="org.eclipse.ui.acceleratorSets">
       <acceleratorSet
@@ -800,6 +877,188 @@
          </action>
       </viewerContribution>
    </extension>
+ <!-- =========================================================================== -->
+<!-- JDT/UI command definitions                                                   -->
+<!-- =========================================================================== -->
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            name="%category.source.name"
+            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
+            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
+            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="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>
+   </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
       <page