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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
index 83b3253..f14a31c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/template/DeclarationProposal.java
@@ -5,20 +5,21 @@
 package net.sourceforge.phpdt.internal.ui.text.template;
 
 import net.sourceforge.phpdt.internal.corext.phpdoc.PHPDocUtil;
-import net.sourceforge.phpdt.internal.corext.template.TemplateContext;
 import net.sourceforge.phpdt.internal.corext.template.TemplateMessages;
-import net.sourceforge.phpdt.internal.corext.template.php.PHPUnitContext;
+import net.sourceforge.phpdt.internal.corext.template.php.JavaContext;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionManager;
 import net.sourceforge.phpdt.internal.ui.text.link.LinkedPositionUI;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import net.sourceforge.phpeclipse.builder.PHPIdentifierLocation;
 
+import org.eclipse.core.resources.IProject;
 import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.ITextViewer;
 import org.eclipse.jface.text.contentassist.IContextInformation;
+import org.eclipse.jface.text.templates.TemplateContext;
 import org.eclipse.swt.graphics.Image;
 //import org.eclipse.jdt.internal.ui.text.link.LinkedPositionManager;
 //import org.eclipse.jdt.internal.ui.text.link.LinkedPositionUI;
@@ -28,6 +29,7 @@ import org.eclipse.swt.graphics.Image;
  * A PHP identifier proposal.
  */
 public class DeclarationProposal extends AbstractProposal { //implements IPHPCompletionProposal {
+  private IProject fProject;
   private final TemplateContext fContext;
   private final PHPIdentifierLocation fLocation;
 
@@ -48,6 +50,7 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
    * @param image     the icon of the proposal.
    */
   public DeclarationProposal(
+      IProject project,
     String identifierName,
     PHPIdentifierLocation location,
     TemplateContext context,
@@ -56,6 +59,7 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
     super(viewer);
     //    Image image_fun,
     //    Image image_var) {
+    fProject = project;
     fIdentifierName = identifierName;
     fLocation = location;
     fContext = context;
@@ -77,7 +81,9 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
         case PHPIdentifierLocation.FUNCTION :
           document.replace(start, end - start, fIdentifierName + "()");
           break;
-
+        case PHPIdentifierLocation.CONSTRUCTOR :
+          document.replace(start, end - start, fIdentifierName + "()");
+          break;
         case PHPIdentifierLocation.METHOD :
           document.replace(start, end - start, fIdentifierName + "()");
           break;
@@ -107,7 +113,9 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
         case PHPIdentifierLocation.FUNCTION :
           editor.setFinalCaretOffset(fIdentifierName.length() + start + 1);
           break;
-
+        case PHPIdentifierLocation.CONSTRUCTOR :
+          editor.setFinalCaretOffset(fIdentifierName.length() + start + 1);
+          break;
         case PHPIdentifierLocation.METHOD :
           editor.setFinalCaretOffset(fIdentifierName.length() + start + 1);
           break;
@@ -134,10 +142,18 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
    */
   public String getAdditionalProposalInfo() {
     StringBuffer hoverInfoBuffer = new StringBuffer();
-    String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
+//    String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
+    String workspaceLocation;
+    if (fProject!=null) {
+      workspaceLocation = fProject.getLocation().toString()+'/';
+    } else {
+      // should never happen?
+      workspaceLocation = PHPeclipsePlugin.getWorkspace()
+      .getRoot().getLocation().toString();
+    }
     String filename = workspaceLocation + fLocation.getFilename();
     PHPDocUtil.appendPHPDoc(hoverInfoBuffer, filename, fLocation);
-    return textToHTML(hoverInfoBuffer.toString());
+    return hoverInfoBuffer.toString();
   }
 
   /*
@@ -151,8 +167,17 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
    * @see ICompletionProposal#getDisplayString()
    */
   public String getDisplayString() {
-    return fIdentifierName + TemplateMessages.getString("TemplateProposal.delimiter") + fIdentifierName; // $NON-NLS-1$ //$NON-NLS-1$
-    //		return fTemplate.getName() + ObfuscatorMessages.getString("TemplateProposal.delimiter") + fTemplate.getDescription(); // $NON-NLS-1$ //$NON-NLS-1$
+//    String workspaceLocation = PHPeclipsePlugin.getWorkspace().getRoot().getLocation().toString();
+    String workspaceLocation;
+    if (fProject!=null) {
+      workspaceLocation = fProject.getLocation().toString()+'/';
+    } else {
+      // should never happen?
+      workspaceLocation = PHPeclipsePlugin.getWorkspace()
+      .getRoot().getLocation().toString();
+    }
+    String filename = workspaceLocation + fLocation.getFilename();
+    return fIdentifierName + TemplateMessages.getString("TemplateProposal.delimiter") + PHPDocUtil.getUsage(filename, fLocation) + TemplateMessages.getString("TemplateProposal.delimiter") + filename; // $NON-NLS-1$ //$NON-NLS-1$
   }
 
   /*
@@ -164,12 +189,16 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
         return PHPUiImages.get(PHPUiImages.IMG_FUN);
       case PHPIdentifierLocation.CLASS :
         return PHPUiImages.get(PHPUiImages.IMG_CLASS);
+      case PHPIdentifierLocation.CONSTRUCTOR :
+        return PHPUiImages.get(PHPUiImages.IMG_CLASS);
       case PHPIdentifierLocation.METHOD :
         return PHPUiImages.get(PHPUiImages.IMG_FUN);
       case PHPIdentifierLocation.DEFINE :
         return PHPUiImages.get(PHPUiImages.IMG_DEFINE);
       case PHPIdentifierLocation.VARIABLE :
         return PHPUiImages.get(PHPUiImages.IMG_VAR);
+      case PHPIdentifierLocation.GLOBAL_VARIABLE :
+        return PHPUiImages.get(PHPUiImages.IMG_VAR);
     }
     return PHPUiImages.get(PHPUiImages.IMG_FUN);
   }
@@ -179,8 +208,8 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
    */
   public int getRelevance() {
 
-    if (fContext instanceof PHPUnitContext) {
-      PHPUnitContext context = (PHPUnitContext) fContext;
+    if (fContext instanceof JavaContext) {
+      JavaContext context = (JavaContext) fContext;
       switch (context.getCharacterBeforeStart()) {
         // high relevance after whitespace
         case ' ' :
@@ -188,7 +217,9 @@ public class DeclarationProposal extends AbstractProposal { //implements IPHPCom
         case '\n' :
         case '\t' :
           return 90;
-
+        case '>' : // ->
+        case ':' : // ::
+          return 95;
         default :
           return 0;
       }