More 3.1 compatibility

[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 b75be07..5a54d38 100644 (file)
--- a/net.sourceforge.phpeclipse.phphelp/plugin.xml
+++ b/net.sourceforge.phpeclipse.phphelp/plugin.xml
@@ -3,7 +3,7 @@
 <plugin
    id="net.sourceforge.phpeclipse.phphelp"
    name="%pluginName"
-   version="1.1.2"
+   version="1.1.6"
    provider-name="%providerName"
    class="net.sourceforge.phpdt.phphelp.PHPHelpPlugin">
 
@@ -24,7 +24,6 @@
       <import plugin="org.eclipse.help"/>
       <import plugin="org.eclipse.swt"/>
       <import plugin="net.sourceforge.phpeclipse"/>
-      <import plugin="net.sourceforge.phpeclipse.quantum.sql"/>
    </requires>
    <extension
          point="org.eclipse.ui.popupMenus">   
@@ -40,23 +39,7 @@
          </action>
       </viewerContribution>
    </extension>
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="phphelp.xml"
-            primary="true">
-      </toc>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            name="%phphelpFormat"
-            category="net.sourceforge.phpeclipse.preference.PHPEclipsePreferencePage"
-            class="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage"
-            id="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage">
-      </page>
-   </extension>
-   
+  
    <extension
          point="org.eclipse.ui.editorActions">
       <editorContribution 
@@ -100,4 +83,21 @@
             configuration="org.eclipse.ui.defaultAcceleratorConfiguration">
       </keyBinding>
   </extension>
+  
+  <extension
+         point="org.eclipse.help.toc">
+      <toc
+            file="phphelp.xml"
+            primary="true">
+      </toc>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            name="%phphelpFormat"
+            category="net.sourceforge.phpeclipse.preferences.PHPPreferencePage"
+            class="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage"
+            id="net.sourceforge.phpdt.phphelp.PHPHelpPreferencePage">
+      </page>
+   </extension>
 </plugin>