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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
index c947cf6..bdbe4d5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPTextHover.java
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Vector;
 
-import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocCharArrayCommentReader;
+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;
@@ -38,6 +38,9 @@ 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) {
@@ -80,25 +83,27 @@ public class PHPTextHover implements ITextHover {
                 PHPIdentifierLocation location;
                 String filename;
                 FileReader phpdocFileReader;
-                PHPDocCharArrayCommentReader phpdocConverter;
+        //        PHPDocCharArrayCommentReader phpdocConverter;
                 StringBuffer hoverInfoBuffer = new StringBuffer();
                 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();
-									hoverInfoBuffer.append(location.toString());
-									hoverInfoBuffer.append('\n');
-                  if (location.getPHPDocOffset() >= 0) {
-                    //                    foundPHPdoc = true;
-                    phpdocFileReader = new FileReader(filename);
-                    char[] charArray = new char[location.getPHPDocLength()];
-                    phpdocFileReader.skip(location.getPHPDocOffset());
-                    phpdocFileReader.read(charArray, 0, location.getPHPDocLength());
-                    phpdocConverter = new PHPDocCharArrayCommentReader(charArray);
-                    hoverInfoBuffer.append(phpdocConverter.getString());
-                    hoverInfoBuffer.append('\n');
-                  }
+                  PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, location);
+//									
+//									hoverInfoBuffer.append(location.toString());
+//									hoverInfoBuffer.append('\n');
+//                  if (location.getPHPDocOffset() >= 0) {
+//                    //                    foundPHPdoc = true;
+//                    phpdocFileReader = new FileReader(filename);
+//                    char[] charArray = new char[location.getPHPDocLength()];
+//                    phpdocFileReader.skip(location.getPHPDocOffset());
+//                    phpdocFileReader.read(charArray, 0, location.getPHPDocLength());
+//                    phpdocConverter = new PHPDocCharArrayCommentReader(charArray);
+//                    hoverInfoBuffer.append(phpdocConverter.getString());
+//                    hoverInfoBuffer.append('\n');
+//                  }
                 }
                 //                if (foundPHPdoc) {
                 hoverInfo = hoverInfoBuffer.toString();