added old hover behaviour;
authorkhartlage <khartlage>
Thu, 4 Mar 2004 20:37:12 +0000 (20:37 +0000)
committerkhartlage <khartlage>
Thu, 4 Mar 2004 20:37:12 +0000 (20:37 +0000)
added a php category for views

net.sourceforge.phpeclipse/plugin.properties
net.sourceforge.phpeclipse/plugin.xml
net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/java/hover/AnnotationHover.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPSourceViewerConfiguration.java
net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java

index d484cf9..47b698b 100644 (file)
@@ -7,6 +7,7 @@ naturePHP.name=PHP Project
 phpProblemName=PHP Problem
 transientPHPProblemName=Transient PHP Problem
 phpTaskName=Java Task
+viewCategoryName=PHP
 
 phpEditorTextHoversName=PHP Editor Text Hovers
 
index 1dce0ed..fae4bbd 100644 (file)
    </extension>
    <extension
          point="org.eclipse.ui.views">
+      <category
+            name="%viewCategoryName"
+            id="net.sourceforge.phpeclipse.views.category">
+      </category>
       <view
             name="%phpConsoleView"
             icon="icons/obj16/php.gif"
index 1c533df..3839e78 100644 (file)
@@ -17,15 +17,19 @@ import net.sourceforge.phpdt.internal.ui.text.HTMLPrinter;
 import net.sourceforge.phpdt.ui.PreferenceConstants;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.phpeditor.JavaAnnotationIterator;
+import net.sourceforge.phpeclipse.phpeditor.PHPTextHover;
 import net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor;
 
+import org.eclipse.core.resources.IFile;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.Position;
 import org.eclipse.jface.text.source.Annotation;
 import org.eclipse.jface.text.source.IAnnotationModel;
+import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.editors.text.EditorsUI;
 import org.eclipse.ui.texteditor.AnnotationPreference;
 import org.eclipse.ui.texteditor.DefaultMarkerAnnotationAccess;
@@ -36,7 +40,7 @@ public class AnnotationHover extends AbstractJavaEditorTextHover {
 
        private IPreferenceStore fStore= PHPeclipsePlugin.getDefault().getPreferenceStore();
        private DefaultMarkerAnnotationAccess fAnnotationAccess= new DefaultMarkerAnnotationAccess();
-       
+       private PHPTextHover fPHPTextHover = null;
        /*
         * Formats a message as HTML text.
         */
@@ -58,11 +62,11 @@ public class AnnotationHover extends AbstractJavaEditorTextHover {
                
                IDocumentProvider provider= PHPeclipsePlugin.getDefault().getCompilationUnitDocumentProvider();
                IAnnotationModel model= provider.getAnnotationModel(getEditor().getEditorInput());
-               
+               String message= null;
                if (model != null) {
                        Iterator e= new JavaAnnotationIterator(model, true);
                        int layer= -1;
-                       String message= null;
+                       
                        while (e.hasNext()) {
                                Annotation a= (Annotation) e.next();
 
@@ -85,7 +89,13 @@ public class AnnotationHover extends AbstractJavaEditorTextHover {
                        if (layer > -1)
                                return formatMessage(message);
                }
-               
+               // Added as long as the above doesn't work
+               if (fPHPTextHover!=null) {
+                 message = fPHPTextHover.getHoverInfo(textViewer, hoverRegion);
+                 if (message!=null) {
+                   return formatMessage(message);
+                 }
+               }
                return null;
        }
        
@@ -93,10 +103,25 @@ public class AnnotationHover extends AbstractJavaEditorTextHover {
         * @see IJavaEditorTextHover#setEditor(IEditorPart)
         */
        public void setEditor(IEditorPart editor) {
-               if (editor instanceof PHPUnitEditor)
+               if (editor instanceof PHPUnitEditor) {
                        super.setEditor(editor);
-               else
+                       if (editor != null) {
+                               IEditorInput editorInput = editor.getEditorInput();
+                               if (editorInput instanceof IFileEditorInput) {
+                                       try {
+                                               IFile f = ((IFileEditorInput) editorInput).getFile();
+                                               fPHPTextHover = new PHPTextHover(f.getProject());
+                                           return;
+                                       } catch (NullPointerException e) {
+                                               // this exception occurs, if getTextHover is called by
+                                               // preference pages !
+                                       }
+                               }
+                       }
+                       fPHPTextHover = new PHPTextHover(null);
+               } else {
                        super.setEditor(null);
+               }
        }
 
        /**
index c870909..627a046 100644 (file)
@@ -289,19 +289,20 @@ public class PHPSourceViewerConfiguration extends SourceViewerConfiguration {
                                return new JavaEditorTextHoverProxy(hoverDescs[i], getEditor());
                        i++;
                }
-               if (fEditor != null) {
-                       IEditorInput editorInput = fEditor.getEditorInput();
-                       if (editorInput instanceof IFileEditorInput) {
-                               try {
-                                       IFile f = ((IFileEditorInput) editorInput).getFile();
-                                       return new PHPTextHover(f.getProject());
-                               } catch (NullPointerException e) {
-                                       // this exception occurs, if getTextHover is called by
-                                       // preference pages !
-                               }
-                       }
-               }
-               return new PHPTextHover(null);
+               return null;
+//             if (fEditor != null) {
+//                     IEditorInput editorInput = fEditor.getEditorInput();
+//                     if (editorInput instanceof IFileEditorInput) {
+//                             try {
+//                                     IFile f = ((IFileEditorInput) editorInput).getFile();
+//                                     return new PHPTextHover(f.getProject());
+//                             } catch (NullPointerException e) {
+//                                     // this exception occurs, if getTextHover is called by
+//                                     // preference pages !
+//                             }
+//                     }
+//             }
+//             return new PHPTextHover(null);
        }
        /*
         * @see SourceViewerConfiguration#getTextHover(ISourceViewer, String)
index 32d7e9b..5535560 100644 (file)
@@ -1,82 +1,78 @@
 /**********************************************************************
-Copyright (c) 2000, 2002 IBM Corp. and others.
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Common Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/cpl-v10.html
+ Copyright (c) 2000, 2002 IBM Corp. and others.
+ All rights reserved. This program and the accompanying materials
+ are made available under the terms of the Common Public License v1.0
+ which accompanies this distribution, and is available at
+ http://www.eclipse.org/legal/cpl-v10.html
 
-Contributors:
-    IBM Corporation - Initial implementation
-    Klaus Hartlage - www.eclipseproject.de
-**********************************************************************/
+ Contributors:
+ IBM Corporation - Initial implementation
+ Klaus Hartlage - www.eclipseproject.de
+ **********************************************************************/
 package net.sourceforge.phpeclipse.phpeditor;
-
 import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-
 import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocUtil;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
 import net.sourceforge.phpeclipse.builder.PHPIdentifierLocation;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPElement;
 import net.sourceforge.phpeclipse.phpeditor.php.PHPWordExtractor;
-
 import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextHover;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.Region;
 import org.eclipse.swt.graphics.Point;
-
 /**
- * Implementation for an <code>ITextHover</code> 
- * which hovers over PHP code.
+ * Implementation for an <code>ITextHover</code> which hovers over PHP code.
  */
 public class PHPTextHover implements ITextHover {
   public static HashMap functionDescriptions = null;
-
   private static PHPWordExtractor phpWordDetector = new PHPWordExtractor();
   /**
    * The current project; maybe <code>null</code> for preference pages
    */
   private IProject fProject;
-
   public PHPTextHover(IProject project) {
     fProject = project;
   }
-  /* (non-Javadoc)
-   * Method declared on ITextHover
+  /*
+   * (non-Javadoc) Method declared on ITextHover
    */
   public String getHoverInfo(ITextViewer textViewer, IRegion hoverRegion) {
     if (hoverRegion != null) {
       try {
         if (hoverRegion.getLength() > -1) {
-          String word = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
+          String word = textViewer.getDocument().get(hoverRegion.getOffset(),
+              hoverRegion.getLength());
           if (functionDescriptions == null) {
             functionDescriptions = new HashMap();
-
-                                               ArrayList syntaxbuffer = PHPSyntaxRdr.getSyntaxData();
+            ArrayList syntaxbuffer = PHPSyntaxRdr.getSyntaxData();
             String strbuffer = null;
             PHPElement elbuffer = null;
-            if (syntaxbuffer!=null) {
-               for (int i=0;i<syntaxbuffer.size();i++) {
-                                                         elbuffer = (PHPElement) syntaxbuffer.get(i);
-                                                               functionDescriptions.put(elbuffer.getName(), elbuffer.getHoverText());
-               }
+            if (syntaxbuffer != null) {
+              for (int i = 0; i < syntaxbuffer.size(); i++) {
+                elbuffer = (PHPElement) syntaxbuffer.get(i);
+                functionDescriptions.put(elbuffer.getName(), elbuffer
+                    .getHoverText());
+              }
             }
-//            
-//            while ((syntaxbuffer != null)
-//              && (!syntaxbuffer.isEmpty() && ((elbuffer = (PHPElement) syntaxbuffer.remove(0)) != null))) {
-//              functionDescriptions.put(elbuffer.getName(), elbuffer.getHoverText());
-//            }
-
+            //            
+            //            while ((syntaxbuffer != null)
+            //              && (!syntaxbuffer.isEmpty() && ((elbuffer = (PHPElement)
+            // syntaxbuffer.remove(0)) != null))) {
+            //              functionDescriptions.put(elbuffer.getName(),
+            // elbuffer.getHoverText());
+            //            }
           }
           String hoverInfo = (String) functionDescriptions.get(word);
           if (hoverInfo == null && fProject != null) {
             // get the possible PHPDoc information from the index file
-            IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault().getIndexManager(fProject);
+            IdentifierIndexManager indexManager = PHPeclipsePlugin.getDefault()
+                .getIndexManager(fProject);
             List list = indexManager.getLocations(word);
             if (list.size() > 0) {
               try {
@@ -84,11 +80,12 @@ public class PHPTextHover implements ITextHover {
                 String filename;
                 FileReader phpdocFileReader;
                 StringBuffer hoverInfoBuffer = new StringBuffer();
-                String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
+                String workspaceLocation = PHPeclipsePlugin.getWorkspace()
+                    .getRoot().getLocation().toString();
                 //                boolean foundPHPdoc = false;
                 for (int i = 0; i < list.size(); i++) {
                   location = (PHPIdentifierLocation) list.get(i);
-                                                                       filename = workspaceLocation + location.getFilename();
+                  filename = workspaceLocation + location.getFilename();
                   PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, location);
                 }
                 hoverInfo = hoverInfoBuffer.toString();
@@ -106,16 +103,17 @@ public class PHPTextHover implements ITextHover {
     }
     return null;
     // don't show this annoying text
-//    return "empty selection";
+    //    return "empty selection";
   }
-
-  /* (non-Javadoc)
-   * Method declared on ITextHover
+  /*
+   * (non-Javadoc) Method declared on ITextHover
    */
   public IRegion getHoverRegion(ITextViewer textViewer, int offset) {
-    Point selection = PHPWordExtractor.findWord(textViewer.getDocument(), offset);
+    Point selection = PHPWordExtractor.findWord(textViewer.getDocument(),
+        offset);
     //  show the extracted word as a tooltip
-    if (selection != null && selection.x <= offset && offset < selection.x + selection.y)
+    if (selection != null && selection.x <= offset
+        && offset < selection.x + selection.y)
       return new Region(selection.x, selection.y);
     return new Region(offset, 0);
   }