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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index a54447b..0cf553c 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -7,7 +7,9 @@
    class="net.sourceforge.phpeclipse.PHPeclipsePlugin">
 
    <runtime>
-      <library name="phpeclipse.jar"/>
+      <library name="phpeclipse.jar">
+         <export name="*"/>
+      </library>
    </runtime>
    <requires>
       <import plugin="org.eclipse.core.resources"/>
@@ -49,6 +51,10 @@
       </fileTypes>
       <fileTypes
             type="text"
+            extension="phtml">
+      </fileTypes>
+      <fileTypes
+            type="text"
             extension="html">
       </fileTypes>
       <fileTypes
@@ -83,7 +89,7 @@
          </description>
       </wizard>
    </extension>
- <!--   <extension
+<!--   <extension
          point="org.eclipse.ui.newWizards">
       <category
             name="%newWizardCategory.name"
@@ -141,30 +147,6 @@
       </view>
    </extension>
    <extension
-         point="org.eclipse.ui.actionDefinitions">
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.comment">
-      </actionDefinition>
-      <actionDefinition
-            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-      </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.phpeclipse.phpeditor.comment">
-         </accelerator>
-         <accelerator
-               key="Ctrl+\"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-         </accelerator>
-      </acceleratorSet>
-   </extension>
-   <extension
          point="org.eclipse.ui.actionSets">
       <actionSet
             label="PHP/Apache"
@@ -180,7 +162,7 @@
          </menu>
          <action
                label="Restart Apache"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/apache_restart.gif"
                tooltip="Restart Apache"
                class="net.sourceforge.phpeclipse.actions.PHPRestartApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -190,7 +172,7 @@
          </action>
          <action
                label="Stop Apache"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/apache_stop.gif"
                tooltip="Stop Apache"
                class="net.sourceforge.phpeclipse.actions.PHPStopApacheAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -210,7 +192,7 @@
          </action>
          <action
                label="Start MySQL"
-               icon="icons/obj16/apache.gif"
+               icon="icons/obj16/sql.gif"
                tooltip="Start MySQL"
                class="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction"
                menubarPath="net.sourceforge.phpeclipse.PHPMenu/phpeclipse"
@@ -219,36 +201,31 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
-      <actionSet
-            label="%phpActionSet.label"
-            visible="false"
-            id="net.sourceforge.phpeclipse.phpeditor.actions.phpActionSet">
-         <menu
-               label="%php.menu.label"
-               path="edit"
-               id="net.sourceforge.phpeclipse.phpeditor.menu">
-            <separator
-                  name="editGroup">
-            </separator>
-         </menu>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.uncomment"
-               accelerator="Ctrl+Shift+\\"
-               label="%phpUncommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.actions.Uncomment">
-         </action>
-         <action
-               definitionId="net.sourceforge.phpeclipse.phpeditor.comment"
-               accelerator="Ctrl+Shift+/"
-               label="%phpCommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.actions.Comment">
-         </action>
-      </actionSet>
    </extension>
+<!--  <extension
+         point="org.eclipse.ui.actionDefinitions">
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.phpeditor.comment">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+      </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.phpeclipse.phpeditor.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\\"
+               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
+         </accelerator>
+      </acceleratorSet>
+   </extension> -->
    <extension
          point="org.eclipse.ui.editors">
       <editor
@@ -286,6 +263,14 @@
       <editor
             name="%phpEditorName"
             icon="icons/obj16/phpedit.gif"
+            extensions="phtml"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
+      <editor
+            name="%phpEditorName"
+            icon="icons/obj16/phpedit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -337,6 +322,28 @@
       </objectContribution>
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.inc"
+            id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.phtml"
+            id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         <action
+               label="Run External PHP Parser"
+               class="net.sourceforge.phpeclipse.actions.PHPExternalParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.externalParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
          <action
@@ -368,16 +375,28 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-      <viewerContribution
-            targetID="#PHPEditorContext"
-            id="net.sourceforge.phpeclipse.actions.popup.editor">
+      <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="PHP Help"
-               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowContextHelp"
+               label="Open PHP Browser"
+               class="net.sourceforge.phpeclipse.actions.PHPEclipseShowAction"
                menubarPath="additions"
-               id="net.sourceforge.phpeclipse.actions.editor.contexthelp">
+               id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
-      </viewerContribution>
+      </objectContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -387,7 +406,7 @@
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
       <page
-            name="PHP Editor"
+            name="Editor"
             category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
@@ -418,6 +437,22 @@
       </provider>
    </extension>
    <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%incFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%phtmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
          point="org.eclipse.ui.views">
       <view
             name="%phpConsoleView"
@@ -426,12 +461,5 @@
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>
    </extension>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="phphelp.xml"
-            primary="true">
-      </toc>
-   </extension>
 
 </plugin>