misc changes

diff --git a/net.sourceforge.phpeclipse.debug.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java b/net.sourceforge.phpeclipse.debug.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
index 027eb91..834d108 100644 (file)
--- a/net.sourceforge.phpeclipse.debug.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
+++ b/net.sourceforge.phpeclipse.debug.phphelp/src/net/sourceforge/phpdt/phphelp/actions/PHPEclipseShowContextHelp.java
@@ -58,18 +58,18 @@ public class PHPEclipseShowContextHelp extends ActionDelegate implements IEditor
       }
     }
     if (editor != null) {
-      editor.openContextHelp();
+      ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
+      IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
+      int pos = selection.getOffset();
+      String word = getFunctionName(doc, pos);
+      openContextHelp(word);
+
     }
   }
 
   public void setActiveEditor(IAction action, IEditorPart targetEditor) {
     if (targetEditor != null && (targetEditor instanceof PHPEditor)) {
       editor = (PHPEditor) targetEditor;
-          IDocument doc = editor.getDocumentProvider().getDocument(editor.getEditorInput());
-    ITextSelection selection = (ITextSelection) editor.getSelectionProvider().getSelection();
-    int pos = selection.getOffset();
-    String word = getFunctionName(doc, pos);
-    openContextHelp(word);
     }
   }
 

diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 68bde16..0cf553c 100644 (file)
--- 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"/>
@@ -199,33 +201,8 @@
                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
-               label="%phpUncommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.uncomment">
-         </action>
-         <action
-               label="%phpCommentAction.label"
-               retarget="true"
-               menubarPath="net.sourceforge.phpeclipse.phpeditor.menu/editGroup"
-               id="net.sourceforge.phpeclipse.phpeditor.comment">
-         </action>
-      </actionSet>  -->
    </extension>
- <!--  <extension
+<!--  <extension
          point="org.eclipse.ui.actionDefinitions">
       <actionDefinition
             id="net.sourceforge.phpeclipse.phpeditor.comment">
@@ -484,4 +461,5 @@
             id="net.sourceforge.phpeclipse.views.phpconsoleview">
       </view>
    </extension>
+
 </plugin>