1) Fixed issue #779: PHPEclipse reports error with a correct try/catch block

[phpeclipse.git] / net.sourceforge.phpeclipse.phphelp / plugin.xml

diff --git a/net.sourceforge.phpeclipse.phphelp/plugin.xml b/net.sourceforge.phpeclipse.phphelp/plugin.xml
index cde80a0..d0fca82 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -1,28 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="net.sourceforge.phpeclipse.phphelp"
-   name="%pluginName"
-   version="1.1.7"
-   provider-name="%providerName"
-   class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
-
-   <runtime>
-      <library name="phphelp.jar">
-      <export name="*"/>
-      </library>
-   </runtime>
-   <requires>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.help"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.swt"/>
-      <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-   </requires>
+<?eclipse version="3.2"?>
+<plugin>
    <extension
          point="org.eclipse.ui.popupMenus">
       <viewerContribution
@@ -37,7 +15,6 @@
          </action>
       </viewerContribution>
    </extension>
-
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution
@@ -49,9 +26,26 @@
                class="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp"
                id="net.sourceforge.phpdt.phphelp.actions.PHPEclipseShowContextHelp">
          </action>
+         <action
+               definitionId="net.sourceforge.phpdt.httpquery.localhost"
+               label="Localhost"
+               class="net.sourceforge.phpdt.httpquery.LocalhostAction"
+               id="net.sourceforge.phpdt.httpquery.LocalhostAction">
+         </action>
+         <action
+                      definitionId="net.sourceforge.phpdt.httpquery.google"
+               label="Google.com"
+               class="net.sourceforge.phpdt.httpquery.GoogleAction"
+               id="net.sourceforge.phpdt.httpquery.GoogleAction">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpdt.httpquery.phpmanual"
+               label="PHP Manual"
+               class="net.sourceforge.phpdt.httpquery.PHPHelpAction"
+               id="net.sourceforge.phpdt.httpquery.PHPHelpAction">
+         </action>
       </editorContribution>
    </extension>
-
    <extension point="org.eclipse.ui.contexts">
       <context
         name="%context.editingPHPSource.name"
@@ -59,23 +53,9 @@
         parentId="org.eclipse.ui.textEditorScope"
         id="net.sourceforge.phpdt.ui.phpEditorScope" />
    </extension>
-   <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.contexthelp.name"
-            description="%ActionDefinition.contexthelp.description"
-            categoryId="net.sourceforge.phpeclipse.ui.category.source"
-            id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
-      </command>
-  </extension>
 
-  <extension
+   <extension
          point="org.eclipse.help.toc">
       <toc
             file="phphelp.xml"
@@ -90,8 +70,97 @@
             class="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage"
             id="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage">
       </page>
+      <page
+           name="%httpQuery"
+           category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+           class="net.sourceforge.phpdt.httpquery.preferences.ConfigurationPreferencePage"
+           id="net.sourceforge.phpdt.httpquery.preferences.configurationPreferencePage">
+      </page>
    </extension>
+
    <extension
+         point="org.eclipse.ui.popupMenus">
+      <viewerContribution
+            targetID="#PHPEditorContext"
+            id="net.sourceforge.phpdt.phphelp.actions.httpquery">
+         <menu
+                       id="httpqueryMenu"
+                       label="%HTTPQuery.label"
+                       path="rest">
+                </menu>
+                <action
+                      definitionId="net.sourceforge.phpdt.httpquery.koders"
+               label="Koders.com"
+               class="net.sourceforge.phpdt.httpquery.KodersAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.KodersAction">
+         </action>
+                <action
+                      definitionId="net.sourceforge.phpdt.httpquery.google"
+               label="Google.com"
+               class="net.sourceforge.phpdt.httpquery.GoogleAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.GoogleAction">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpdt.httpquery.phpmanual"
+               label="PHP Manual"
+               class="net.sourceforge.phpdt.httpquery.PHPHelpAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.PHPHelpAction">
+         </action>
+         <action
+               definitionId="net.sourceforge.phpdt.httpquery.localhost"
+               label="Localhost"
+               class="net.sourceforge.phpdt.httpquery.LocalhostAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.LocalhostAction">
+         </action>
+                <action
+               label="HTTP Query..."
+               class="net.sourceforge.phpdt.httpquery.HTTPQueryAction"
+               menubarPath="httpqueryMenu/additions"
+               id="net.sourceforge.phpdt.httpquery.HTTPQueryAction">
+         </action>
+      </viewerContribution>
+    </extension>
+
+    <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.contexthelp.name"
+            description="%ActionDefinition.contexthelp.description"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.phphelp.actions.contexthelp">
+      </command>
+      <command
+            name="Localhost"
+            description="Open localhost"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.httpquery.localhost">
+      </command>
+      <command
+            name="Google"
+            description="Open Google.com"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.httpquery.google">
+      </command>
+      <command
+            name="PHP Manual"
+            description="Open PHP Manual"
+            categoryId="net.sourceforge.phpeclipse.ui.category.source"
+            id="net.sourceforge.phpdt.httpquery.phpmanual">
+      </command>
+
+     </extension>
+
+     <extension
          point="org.eclipse.ui.bindings">
       <key
             sequence="Ctrl+Shift+H"
@@ -99,5 +168,23 @@
             commandId="net.sourceforge.phpdt.phphelp.actions.contexthelp"
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
       </key>
+      <key
+            sequence="Ctrl+F8"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpdt.httpquery.localhost"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+G"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpdt.httpquery.google"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            sequence="Ctrl+Shift+O"
+            contextId="net.sourceforge.phpdt.ui.phpEditorScope"
+            commandId="net.sourceforge.phpdt.httpquery.phpmanual"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
    </extension>
 </plugin>