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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 369460f..a54447b 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -14,8 +14,156 @@
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.swt"/>
+      <import plugin="org.eclipse.debug.ui"/>
+      <import plugin="org.apache.xerces"/>
    </requires>
 
+
+   <extension
+         id="phpnature"
+         name="%naturePHP.name"
+         point="org.eclipse.core.resources.natures">
+      <runtime>
+         <run
+               class="net.sourceforge.phpeclipse.PHPProject">
+         </run>
+      </runtime>
+   </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="inc">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="html">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="htm">
+      </fileTypes>
+   </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>
+   </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>
+   </extension>
+ <!--   <extension
+         point="org.eclipse.ui.newWizards">
+      <category
+            name="%newWizardCategory.name"
+            id="net.sourceforge.phpeclipse.wizardCategory">
+      </category>
+      <wizard
+            name="%newWizardPHPFile.name"
+            icon="icons/obj16/phpedit.gif"
+            category="net.sourceforge.phpeclipse.wizardCategory"
+            class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
+            id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
+         <description>
+            Create a basic PHP file.
+         </description>
+      </wizard>
+   </extension> -->
+   <extension
+         point="org.eclipse.ui.projectNatureImages">
+      <image
+            icon="icons/obj16/php.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.PropertyPagePHPProject">
+         <filter
+               name="nature"
+               value="net.sourceforge.phpeclipse.phpnature">
+         </filter>
+      </page>
+      <page
+            objectClass="net.sourceforge.phpeclipse.PHPProject"
+            name="%propertyPagePHPProject.name"
+            class="net.sourceforge.phpeclipse.preferences.PHPProjectPropertyPage"
+            id="net.sourceforge.phpeclipse.preferences.PropertyPagePHPProject">
+         <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.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
@@ -71,12 +219,41 @@
                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.editors">
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -84,7 +261,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -92,7 +269,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php4"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -100,32 +277,31 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="inc"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="htm"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/php.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="html"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
             id="net.sourceforge.phpeclipse.PHPEditor">
-      </editor>   
+      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
-      
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
@@ -159,7 +335,6 @@
                id="net.sourceforge.phpeclipse.actions.externalParserAction">
          </action>
       </objectContribution>
-      
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php"
@@ -193,7 +368,6 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-      
       <viewerContribution
             targetID="#PHPEditorContext"
             id="net.sourceforge.phpeclipse.actions.popup.editor">
@@ -214,9 +388,9 @@
       </page>
       <page
             name="PHP Editor"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
             class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
-            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage"
-            category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
       </page>
    </extension>
    <extension
@@ -253,20 +427,6 @@
       </view>
    </extension>
    <extension
-         point="org.eclipse.ui.newWizards">
-      <category
-            name="PHP"
-            id="net.sourceforge.phpeclipse.wizardCategory">
-      </category>
-      <wizard
-            name="PHP File"
-            icon="icons/obj16/java.gif"
-            category="net.sourceforge.phpeclipse.wizardCategory"
-            class="net.sourceforge.phpeclipse.wizards.PHPFileWizard"
-            id="net.sourceforge.phpeclipse.wizards.PHPFileWizard">
-      </wizard>
-   </extension>
-   <extension
          point="org.eclipse.help.toc">
       <toc
             file="phphelp.xml"