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

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index b8fec77..7783dea 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -2,22 +2,148 @@
 <plugin
    id="net.sourceforge.phpeclipse"
    name="%pluginName"
-   version="1.0.2"
+   version="1.0.6"
    provider-name="%providerName"
    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"/>
       <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="phtml">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="html">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="htm">
+      </fileTypes>
+      <fileTypes
+            type="text"
+            extension="xml">
+      </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>
+      <wizard
+            name="%newWizardPHPFile.name"
+            icon="icons/obj16/phpedit.gif"
+            category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
+            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.actionSets">
       <actionSet
             label="PHP/Apache"
@@ -33,7 +159,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"
@@ -43,7 +169,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"
@@ -63,7 +189,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"
@@ -72,12 +198,57 @@
                id="net.sourceforge.phpeclipse.actions.PHPStartMySQLAction">
          </action>
       </actionSet>
+      <actionSet
+		id="net.sourceforge.phpeclipse.ui.CodingActionSet"
+        label="%phpActionSet.label"
+		visible="false"
+		description="%CodingActionSet.description">
+		<menu
+            id="net.sourceforge.phpeclipse.ui.source.menu"
+            label="%php.menu.label"
+            path="edit">
+         	<separator name="editGroup"/>
+      	</menu>
+      	<action id="net.sourceforge.phpdt.ui.actions.Uncomment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%phpUncommentAction.label"
+			retarget="true" />
+			
+		<action id="net.sourceforge.phpdt.ui.actions.Comment"
+      		menubarPath="net.sourceforge.phpeclipse.ui.source.menu/editGroup"
+      		label="%phpCommentAction.label"
+			retarget="true" />
+	  </actionSet> 
    </extension>
    <extension
+         point="org.eclipse.ui.actionDefinitions">
+      <actionDefinition
+            id="net.sourceforge.phpdt.ui.actions.comment">
+      </actionDefinition>
+      <actionDefinition
+            id="net.sourceforge.phpdt.ui.actions.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.phpdt.ui.actions.comment">
+         </accelerator>
+         <accelerator
+               key="Ctrl+\\"
+               id="net.sourceforge.phpdt.ui.actions.uncomment">
+         </accelerator>
+      </acceleratorSet>
+   </extension> 
+   <extension
          point="org.eclipse.ui.editors">
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/java.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -85,7 +256,7 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/java.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php3"
             contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
             class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
@@ -93,17 +264,145 @@
       </editor>
       <editor
             name="%phpEditorName"
-            icon="icons/obj16/java.gif"
+            icon="icons/obj16/phpedit.gif"
             extensions="php4"
             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="inc"
+            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="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/htmledit.gif"
+            extensions="htm"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
+      <editor
+            name="%phpEditorName"
+            icon="icons/obj16/htmledit.gif"
+            extensions="html"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
+      <editor
+            name="%phpEditorName"
+            icon="icons/obj16/xmledit.gif"
+            extensions="xml"
+            contributorClass="net.sourceforge.phpeclipse.phpeditor.PHPActionContributor"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPEditor"
+            id="net.sourceforge.phpeclipse.PHPEditor">
+      </editor>
    </extension>
    <extension
          point="org.eclipse.ui.popupMenus">
       <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.html"
+            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         <action
+               label="Run JTidy Parser"
+               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.htm"
+            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         <action
+               label="Run JTidy Parser"
+               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.xml"
+            id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         <action
+               label="Run JTidy Parser"
+               class="net.sourceforge.phpeclipse.actions.HTMLParserAction"
+               menubarPath="additions"
+               id="net.sourceforge.phpeclipse.actions.htmlParserAction">
+         </action>
+      </objectContribution>
+      <objectContribution
+            objectClass="org.eclipse.core.resources.IFile"
+            nameFilter="*.php"
+            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="*.php3"
+            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="*.php4"
+            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="*.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
@@ -113,7 +412,7 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-            <objectContribution
+      <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php3"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
@@ -124,7 +423,7 @@
                id="net.sourceforge.phpeclipse.actions.showAction">
          </action>
       </objectContribution>
-            <objectContribution
+      <objectContribution
             objectClass="org.eclipse.core.resources.IFile"
             nameFilter="*.php4"
             id="net.sourceforge.phpeclipse.actions.popupShowAction">
@@ -135,16 +434,63 @@
                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>
+       
+	  <viewerContribution 
+		id="net.sourceforge.phpdt.ui.PHPEditorPopupActions" 
+		targetID="#PHPRulerContext">
+		<action
+			id="org.eclipse.ui.texteditor.TaskRulerAction"
+			menubarPath="add"
+			label="%AddTask.label"
+			tooltip="%AddTask.tooltip"
+            helpContextId="org.eclipse.ui.AddTask_action_context"
+			class="org.eclipse.ui.texteditor.TaskRulerAction">
+		</action>
+		<action
+			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			menubarPath="add"
+			label="%AddBookmark.label"
+			tooltip="%AddBookmark.tooltip"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+			class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		</action>
+  	  </viewerContribution>
+   </extension>
+   <extension point="org.eclipse.ui.editorActions">
+	<editorContribution
+		id="org.eclipse.ui.texteditor.ruler.actions"
+		targetID="net.sourceforge.phpeclipse.PHPEditor">
+
+		<action
+			id="org.eclipse.ui.texteditor.BookmarkRulerAction"
+			actionID="RulerDoubleClick"
+			label="%Dummy.label"
+            helpContextId="org.eclipse.ui.bookmark_action_context"
+			class="org.eclipse.ui.texteditor.BookmarkRulerAction">
+		</action>
+	</editorContribution>
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">
@@ -153,6 +499,17 @@
             class="net.sourceforge.phpeclipse.PHPEclipsePreferencePage"
             id="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
       </page>
+      <page
+            name="Editor"
+            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
+            class="net.sourceforge.phpeclipse.PHPSyntaxPreferencePage"
+            id="net.sourceforge.phpeclipse.preference.PHPSyntaxPreferencePage">
+      </page>
+      <page name="Templates"
+		id = "net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+		class="net.sourceforge.phpdt.internal.ui.preferences.TemplatePreferencePage"
+		category= "net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage">
+	  </page>
    </extension>
    <extension
          point="org.eclipse.ui.documentProviders">
@@ -162,7 +519,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-      <extension
+   <extension
          point="org.eclipse.ui.documentProviders">
       <provider
             extensions="%php3FileExtension"
@@ -170,7 +527,7 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-      <extension
+   <extension
          point="org.eclipse.ui.documentProviders">
       <provider
             extensions="%php4FileExtension"
@@ -178,7 +535,54 @@
             id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
       </provider>
    </extension>
-   <extension point="org.eclipse.help.toc">
-      <toc file="phphelp.xml" primary="true"/>
+   <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.documentProviders">
+      <provider
+            extensions="%htmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%htmFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.documentProviders">
+      <provider
+            extensions="%xmlFileExtension"
+            class="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider"
+            id="net.sourceforge.phpeclipse.phpeditor.PHPDocumentProvider">
+      </provider>
+   </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            name="%phpConsoleView"
+            icon="icons/obj16/php.gif"
+            class="net.sourceforge.phpeclipse.views.PHPConsole"
+            id="net.sourceforge.phpeclipse.views.phpconsoleview">
+      </view>
+   </extension>
+
 </plugin>